moved button, fixed localization
Merge pull request #488 from concerto/move_change_password_button

moved change password button, fixed localization