diff --git a/src/Module/Login.php b/src/Module/Login.php
index 0cc65c3c32..330988df50 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -46,7 +46,7 @@ class Login extends BaseModule
 			$a->internalRedirect();
 		}
 
-		return self::form($_SESSION['return_path'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
+		return self::form(defaults($_SESSION, 'return_path', null), intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
 	}
 
 	public static function post()