fixes #2131 Problems with the forgot password

Added forgot password on master