Update password reset functionality

Oliver Falkrequested to merge
devel into master

Enhance the password reset functionality and add appropriate unit tests

Merge request reports