Revert "Dirty change to retrieve password"

This reverts commit 0d2cd206865081114a954801a4985c500005d483.