addressed issue globaleaks/GlobaLeaks#1007
fixed stupid bugs due to wrong cut+paste
Merge pull request #1012 from globaleaks/feature/password_change_on_first_login

addressed issue globaleaks/GlobaLeaks#1007