diff --git a/server/boot/a-extendUser.js b/server/boot/a-extendUser.js
index 25cc14bf0a..b212550a8a 100644
--- a/server/boot/a-extendUser.js
+++ b/server/boot/a-extendUser.js
@@ -56,9 +56,12 @@ module.exports = function(app) {
   });
 
   // send welcome email to new camper
-  User.afterRemote('create', function(ctx, user, next) {
+  User.afterRemote('create', function({ req, res }, user, next) {
     debug('user created, sending email');
     if (!user.email) { return next(); }
+    const redirect = req.session && req.session.returnTo ?
+      req.session.returnTo :
+      '/';
 
     var mailOptions = {
       type: 'email',
@@ -81,13 +84,13 @@ module.exports = function(app) {
     debug('sending welcome email');
     Email.send(mailOptions, function(err) {
       if (err) { return next(err); }
-      ctx.req.logIn(user, function(err) {
+      req.logIn(user, function(err) {
         if (err) { return next(err); }
 
-        ctx.req.flash('success', {
+        req.flash('success', {
           msg: [ "Welcome to Free Code Camp! We've created your account." ]
         });
-        ctx.res.redirect('/');
+        res.redirect(redirect);
       });
     });
   });