[FIX] Resolve merge conflict

-Fix flow in password required flow
-Other UI changes on the security settings page