Trac Ticket 396 - Account Usability Control Not Working
Ticket 378 - unhashed#user#password visible after changing password
fix typo in previous patch
(cherry picked from commit 95251fa7092aa373f3b5ee08cec674c3031a4eec)
(cherry picked from commit d695b298faa3e6347b43c5804097dce7163c4f07)