sending username in password reset email

auth-server/src/services/email.ts

@@ -61,7 +61,7 @@ export const sendResetPasswordEmail = (user: User, token: string): void => {
 	const msg = {
 		from: FROM,
 		html: text,
-		subject: 'Reset Your Password',
+		subject: 'Username or password reset request',
 		text,
 		to: user.email
 	};

auth-server/src/utils/emailTemplates.ts

@@ -47,15 +47,14 @@ export const verificationEmailTemplate = container(`
 
 export const resetPasswordEmailTemplate = container(`
     <p>
-        Hi <%= username %>!<br/><br/>
+        Hi!<br/><br/>
 
-        It looks like you need to reset your password.<br />
-        Your secret is safe with us, and this will be a breeze.<br /><br />
+        The username association with this email is <%= username %><br /><br />
 
-        Go ahead and follow the link to reset your password:<br /><br />
+        If you need to reset your password, go ahead and follow this link:<br /><br />
         <a href="<%= resetUrl %>">Reset Your Password</a><br /><br />
 
-        Just a heads up, to make sure your information is safe and secure, the link will expire after 24 hours.<br /><br />
+        Just a heads up, to make sure your information is safe and secure, the above link will expire after 24 hours.<br /><br />
 
         If you didn't request a password change, then just ignore this message.<br /><br />
 

front-end/src/components/Login/Web2Login.tsx

@@ -84,7 +84,7 @@ const LoginForm = ({ className, toggleWeb2Login }:Props): JSX.Element => {
 					{errors.password && <span className={'errorText'}>{messages.VALIDATION_PASSWORD_ERROR}</span>}
 
 					<div className='text-muted'>
-						<Link to='/request-reset-password'>Forgot your password?</Link>
+						<Link to='/request-reset-password'>Forgot your password or username?</Link>
 					</div>
 				</Form.Field>
 			</Form.Group>