diff --git a/src/classes/page.php b/src/classes/page.php
index 6355f5f2..d1a5786a 100644
--- a/src/classes/page.php
+++ b/src/classes/page.php
@@ -148,11 +148,13 @@ class Page
             'changelog',
             'wishlist',
         );
+
         if (
                !isset($_SESSION['user'])
             && isset($_SESSION['_GET']['page'])
             && !in_array($_SESSION['_GET']['page'], $ignorePower)
         ) {
+            $_SESSION['REDIRECT_URL'] = $_SERVER['REQUEST_URI'];
             redirect(Page::PAGE_LOGIN);
         }
 
diff --git a/src/pages/login.php b/src/pages/login.php
index 0e3ba3f2..192bc38b 100644
--- a/src/pages/login.php
+++ b/src/pages/login.php
@@ -40,7 +40,11 @@ if (isset($_POST['login'], $_POST['email'], $_POST['password'])) {
 }
 
 if (isset($_SESSION['user'])) {
-    redirect(Page::PAGE_HOME);
+    if (isset($_SESSION['REDIRECT_URL'])) {
+        redirect($_SESSION['REDIRECT_URL']);
+    } else {
+        redirect(Page::PAGE_HOME);
+    }
 }
 
 /**