Added special case where password recovery token used when logged in
Merge remote-tracking branch 'origin/master'