diff --git a/src/Module/Login.php b/src/Module/Login.php
index f1f728ae90..25ddd13502 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -42,7 +42,7 @@ class Login extends BaseModule
 			goaway(self::getApp()->get_baseurl());
 		}
 
-		return self::form(self::getApp()->get_baseurl(), intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
+		return self::form($_SESSION['return_url'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
 	}
 
 	public static function post()