This reverts commit 028de77c. Reason for revert: password view is disappearing Change-Id: Idea76c88e620659c8cf55b64052ffddc184d508b