Fix password recovery
Revert "Fix password recovery"

This reverts commit d6096e4a379a6a28ac54da9069db648d654c6f77.
Re commit for password fix
Fix some login messages