diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index cac6d0a867..58c4371d97 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -246,40 +246,29 @@ module.exports = function(app) {
           return Observable.just('/challenges/' + dasherize(challenge.name));
         }
 
-        if (challenge) {
-          if (req.user) {
-            req.user.currentChallenge = {
-              challengeId: challenge.id,
-              challengeName: challenge.name,
-              dashedName: challenge.dashedName
-            };
-          }
-
-          // save user does nothing if user does not exist
-          return saveUser(req.user)
-            .map(() => ({
-              title: challenge.name,
-              dashedName: origChallengeName,
-              name: challenge.name,
-              details: challenge.description,
-              tests: challenge.tests,
-              challengeSeed: challenge.challengeSeed,
-              verb: utils.randomVerb(),
-              phrase: utils.randomPhrase(),
-              compliment: utils.randomCompliment(),
-              challengeId: challenge.id,
-              challengeType: challenge.challengeType,
-              // video challenges
-              video: challenge.challengeSeed[0],
-              // bonfires specific
-              difficulty: Math.floor(+challenge.difficulty),
-              bonfires: challenge,
-              MDNkeys: challenge.MDNlinks,
-              MDNlinks: getMDNLinks(challenge.MDNlinks),
-              // htmls specific
-              environment: utils.whichEnvironment()
-            }));
-        }
+        // save user does nothing if user does not exist
+        return Observable.just({
+          title: challenge.name,
+          dashedName: origChallengeName,
+          name: challenge.name,
+          details: challenge.description,
+          tests: challenge.tests,
+          challengeSeed: challenge.challengeSeed,
+          verb: utils.randomVerb(),
+          phrase: utils.randomPhrase(),
+          compliment: utils.randomCompliment(),
+          challengeId: challenge.id,
+          challengeType: challenge.challengeType,
+          // video challenges
+          video: challenge.challengeSeed[0],
+          // bonfires specific
+          difficulty: Math.floor(+challenge.difficulty),
+          bonfires: challenge,
+          MDNkeys: challenge.MDNlinks,
+          MDNlinks: getMDNLinks(challenge.MDNlinks),
+          // htmls specific
+          environment: utils.whichEnvironment()
+        });
       })
       .subscribe(
         function(data) {