fixes #2131 Problems with the forgot password