Revert "Revert "temp fix for no password display error""

This reverts commit 6e87f96707653012dcbe60148123f05c15d6d8b7.