Fixed bug with Forgot Password
Merge origin/master