diff --git a/server/boot/a-extendUser.js b/server/boot/a-extendUser.js
index 3e9dbf0305..8cdbd16972 100644
--- a/server/boot/a-extendUser.js
+++ b/server/boot/a-extendUser.js
@@ -81,20 +81,19 @@ module.exports = function(app) {
         'emails',
         'a-extend-user-welcome.ejs'
       ),
-      redirect: '/'
+      redirect: '/email-signin'
     };
 
     debug('sending welcome email');
     return user.verify(mailOptions, function(err) {
       if (err) { return next(err); }
-      return req.logIn(user, function(err) {
-        if (err) { return next(err); }
-
-        req.flash('success', {
-          msg: [ "Welcome to Free Code Camp! We've created your account." ]
-        });
-        return res.redirect(redirect);
+      req.flash('success', {
+        msg: [ 'Congratulations ! We\'ve created your account. ',
+               'Please check your email. We sent you a link that you can ',
+               'click to verify your email address and then login.'
+             ].join('')
       });
+      return res.redirect(redirect);
     });
   });
 };