Forgot password and mailer fixes