diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index 39cb57a33c..1102da7f62 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -240,7 +240,12 @@ module.exports = function(app) {
         }
 
         if (dasherize(challenge.name) !== origChallengeName) {
-          return Observable.just('/challenges/' + dasherize(challenge.name) + '?solution=' + solutionCode);
+          return Observable.just(
+            '/challenges/' +
+            dasherize(challenge.name) +
+            '?solution=' +
+            encodeURIComponent(solutionCode)
+          );
         }
 
         // save user does nothing if user does not exist
diff --git a/server/boot/user.js b/server/boot/user.js
index 69e1d61e81..09e1034bcc 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -197,8 +197,7 @@ module.exports = function(app) {
           bonfires: bonfires,
           moment: moment,
           longestStreak: user.longestStreak,
-          currentStreak: user.currentStreak,
-          encodeURI: encodeURI
+          currentStreak: user.currentStreak
         });
       }
     );