From 1628c352fdf04ab7bc8561d1651f81dc4c54b5f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Mon, 12 Jun 2017 13:33:30 -0400
Subject: [PATCH] closes #5750

---
 public/src/client/login.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/src/client/login.js b/public/src/client/login.js
index 078b7448f7..d78f70a85f 100644
--- a/public/src/client/login.js
+++ b/public/src/client/login.js
@@ -35,8 +35,14 @@ define('forum/login', [], function () {
 					headers: {
 						'x-csrf-token': config.csrf_token,
 					},
-					success: function (data) {
-						window.location.href = data + '?loggedin';
+					success: function (returnTo) {
+						var pathname = utils.urlToLocation(returnTo).pathname;
+
+						var params = utils.params({ url: returnTo });
+						params.loggedin = true;
+						var qs = decodeURIComponent($.param(params));
+
+						window.location.href = pathname + '?' + qs;
 					},
 					error: function (data) {
 						if (data.status === 403 && data.responseText === 'Forbidden') {