Fix regression in system app
Fix regression in system app and change password function
milestone