diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index c03664036..ae00ba324 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1176,11 +1176,15 @@ define([
             }
         });
         $userAdmin.find('a.login').click(function (e) {
-            sessionStorage.redirectTo = window.location.href;
+            if (window.location.pathname !== "/") {
+                sessionStorage.redirectTo = window.location.href;
+            }
             window.location.href = '/login/';
         });
         $userAdmin.find('a.register').click(function (e) {
-            sessionStorage.redirectTo = window.location.href;
+            if (window.location.pathname !== "/") {
+                sessionStorage.redirectTo = window.location.href;
+            }
             window.location.href = '/register/';
         });