Dont revert user passwords
Merge branch 'bugfix-user-passwords'