diff --git a/common/models/user.js b/common/models/user.js
index 9749fba914..9f82a86ea3 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -178,7 +178,11 @@ module.exports = function(User) {
       debug('user logged in');
 
       if (req.session && req.session.returnTo) {
-        return res.redirect(req.session.returnTo);
+        var redirectTo = req.session.returnTo;
+        if (redirectTo === '/map-aside') {
+          redirectTo = '/map';
+        }
+        return res.redirect(redirectTo);
       }
 
       req.flash('success', { msg: 'Success! You are logged in.' });
diff --git a/server/middlewares/add-return-to.js b/server/middlewares/add-return-to.js
index 920f52eafc..8a5b2b0dc0 100644
--- a/server/middlewares/add-return-to.js
+++ b/server/middlewares/add-return-to.js
@@ -36,7 +36,8 @@ export default function addReturnToUrl() {
     ) {
       return next();
     }
-    req.session.returnTo = req.originalUrl;
+    req.session.returnTo = req.originalUrl === '/map-aside'
+    ? '/map' : req.originalUrl;
     next();
   };
 }