Task #257: Fix bug: Now user can change password and email.
Merge branch '257' into test