Merge branch 'MLAB-222' into 'testing'

an update on reset password

See merge request !113
2 jobs for testing in 35 seconds (queued for 4 seconds)