From 4ac8d29f060d4208afbfc15a11f9e447549cd149 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 1 Aug 2017 13:17:03 -0400
Subject: [PATCH] closes #5847

---
 src/middleware/user.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/middleware/user.js b/src/middleware/user.js
index 6b0abaf5b0..b80b91fea3 100644
--- a/src/middleware/user.js
+++ b/src/middleware/user.js
@@ -166,7 +166,13 @@ module.exports = function (middleware) {
 					return next();
 				}
 
-				req.session.returnTo = req.path.replace(/^\/api/, '');
+				var returnTo = req.path;
+				if (nconf.get('relative_path')) {
+					returnTo = req.path.replace(new RegExp('^' + nconf.get('relative_path')), '');
+				}
+				returnTo = returnTo.replace(/^\/api/, '');
+
+				req.session.returnTo = nconf.get('relative_path') + returnTo;
 				req.session.forceLogin = 1;
 				if (res.locals.isAPI) {
 					res.status(401).json({});