Added retype app password logic
Merge branch 'new'