fix handling of change password link
Merge branch 'itsisu-dev' into itsisu-staging