Merge branch 'cherry-pick-fa976f4b' into 'testing'

fix UI issue in Reset Password page

See merge request !135
1 job for testing in 20 seconds (queued for 2 seconds)