diff --git a/public/src/client/login.js b/public/src/client/login.js index 2f0d9634cf..22f1dca9eb 100644 --- a/public/src/client/login.js +++ b/public/src/client/login.js @@ -53,7 +53,7 @@ define('forum/login', ['csrf'], function(csrf) { var returnToEl = document.createElement('input'); returnToEl.type = 'hidden'; returnToEl.name = 'returnTo'; - returnToEl.value = app.previousUrl.replace(window.location.origin + RELATIVE_PATH, ''); + returnToEl.value = app.previousUrl; $(returnToEl).appendTo(formEl); } }; diff --git a/src/routes/authentication.js b/src/routes/authentication.js index 560ae195bb..60d231dfba 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -183,10 +183,11 @@ if (!req.session.returnTo) { res.status(200).send(nconf.get('relative_path') + '/'); } else { + var next = req.session.returnTo; delete req.session.returnTo; - res.status(200).send(nconf.get('relative_path') + next); + res.status(200).send(next); } }); })(req, res, next);