diff --git a/macros/pass2_session.json b/macros/pass2_session.json
index 17fc6bd..86c7e82 100644
--- a/macros/pass2_session.json
+++ b/macros/pass2_session.json
@@ -1,6 +1,6 @@
 {
-"REQUIRE_LOGIN":"if (!$login) { header(\"Location: https:\/\/%DOMAIN_NAME%%CONTENT_DIR%\/login\/\\?error=session\"); die(); }",
-"NO_CHEAP_SESSION_STEALING":"if (isset($_SESSION['user_id'])) {if ($_SESSION['user_ip']!=$_SERVER['REMOTE_ADDR'] || $_SESSION['user_http_user_agent']!=$_SERVER['HTTP_USER_AGENT']){ $_SESSION = array(); if (ini_get(\"session.use_cookies\")){ $params = session_get_cookie_params(); setcookie(session_name(), '', time() - 42000, $params[\"path\"], $params[\"domain\"], $params[\"secure\"], $params[\"httponly\"]); } session_destroy(); header(\"Location: https://%DOMAIN_NAME%%CONTENT_DIR%/login/\\?error=session\"); die();}}",
+"REQUIRE_LOGIN":"if (!$login) { header(\"Location: https:\/\/%DOMAIN_NAME%/%CONTENT_DIR%\/login\/\\?error=session\"); die(); }",
+"NO_CHEAP_SESSION_STEALING":"if (isset($_SESSION['user_id'])) {if ($_SESSION['user_ip']!=$_SERVER['REMOTE_ADDR'] || $_SESSION['user_http_user_agent']!=$_SERVER['HTTP_USER_AGENT']){ $_SESSION = array(); if (ini_get(\"session.use_cookies\")){ $params = session_get_cookie_params(); setcookie(session_name(), '', time() - 42000, $params[\"path\"], $params[\"domain\"], $params[\"secure\"], $params[\"httponly\"]); } session_destroy(); header(\"Location: https://%DOMAIN_NAME%/%CONTENT_DIR%/login/\\?error=session\"); die();}}",
 "SET_LOGIN_VARIABLE":"if (isset($_SESSION['user_id'])) { $login = true; } else { $login = false; }",
 "FORCE_LOGOUT":"$_SESSION = array(); if (ini_get('session.use_cookies')) { $params = session_get_cookie_params(); setcookie(session_name(), '', time() - 42000, $params['path'], $params['domain'], $params['secure'], $params['httponly']);} session_destroy();"
 }
diff --git a/src/login/redirect.php b/src/login/redirect.php
index 3560bfc..882b2fe 100644
--- a/src/login/redirect.php
+++ b/src/login/redirect.php
@@ -15,15 +15,15 @@ if ($statement->rowCount() > 0) {
     // IP and user agent string are used to prevent cheap session stealing
     $_SESSION['user_ip'] = $_SERVER['REMOTE_ADDR'];
     $_SESSION['user_http_user_agent'] = $_SERVER['HTTP_USER_AGENT'];
-    header("Location: https://%DOMAIN_NAME%%CONTENT_DIR%/userhome/");
+    header("Location: https://%DOMAIN_NAME%/%CONTENT_DIR%/userhome/");
   } else {
     //password inorrect
-    header("Location: https://%DOMAIN_NAME%%CONTENT_DIR%/login/?error=credentials");
+    header("Location: https://%DOMAIN_NAME%/%CONTENT_DIR%/login/?error=credentials");
     die();
   }
 } else {
   //wrong user name
-  header("Location: https://%DOMAIN_NAME%%CONTENT_DIR%/login/?error=credentials");
+  header("Location: https://%DOMAIN_NAME%/%CONTENT_DIR%/login/?error=credentials");
   die();
 }
 ?>