diff --git a/controllers/user.js b/controllers/user.js
index bc46b8553fb..97ea084550f 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -428,7 +428,8 @@ exports.getReset = function(req, res) {
         return res.redirect('/forgot');
       }
       res.render('account/reset', {
-        title: 'Password Reset'
+        title: 'Password Reset',
+        token: req.params.token
       });
     });
 };
@@ -581,18 +582,18 @@ exports.postForgot = function(req, res, next) {
         from: 'Team@freecodecamp.com',
         subject: 'Reset your Free Code Camp password',
         text: [
-          'You are receiving this email because you (or someone else)',
+          'You are receiving this email because you (or someone else)\n',
           'requested we reset your Free Code Camp account\'s password.\n\n',
-          'Please click on the following link, or paste this into your',
+          'Please click on the following link, or paste this into your\n',
           'browser to complete the process:\n\n',
           'http://',
           req.headers.host,
           '/reset/',
           token,
           '\n\n',
-          'If you did not request this, please ignore this email and',
+          'If you did not request this, please ignore this email and\n',
           'your password will remain unchanged.\n'
-        ].join(' ')
+        ].join('')
       };
       transporter.sendMail(mailOptions, function(err) {
         if (err) { return done(err); }
diff --git a/views/account/reset.jade b/views/account/reset.jade
index ac5e88584b5..cfea79e93fb 100644
--- a/views/account/reset.jade
+++ b/views/account/reset.jade
@@ -1,9 +1,9 @@
 extends ../layout
 
 block content
-  .col-sm-8.col-sm-offset-2
-    form(method='POST')
-      legend Reset Password
+  .col-sm-8.col-sm-offset-2.jumbotron
+    form(action='/reset/#{token}', method='POST')
+      h1 Reset Password
       input(type='hidden', name='_csrf', value=_csrf)
       .form-group
         label(for='password') New Password