Removed broken reset password redirect
Merge origin/master