Merge branch 'hotfix-retry-page'
Make it possible to change password.
Merge branch 'hotfix-change-password' into develop