A fix for BAU-116, users can not reset their password until their email has been verified
Merge remote-tracking branch 'origin/dev-BAU-116' into release/2.5rc