Change password and routing fix

Trygve Jørgensenrequested to merge
enhancement/project-cleanup into dev

Merge request reports