#146 made a different form for changing password
#146 Code review
Merge branch 'issue_146' into develop