diff --git a/includes/loggedin.php b/includes/loggedin.php
index 3f1883b..4b35bda 100644
--- a/includes/loggedin.php
+++ b/includes/loggedin.php
@@ -80,6 +80,8 @@
 				if($_SESSION['_config']['oldlocation'])
 					$_SESSION['_config']['oldlocation'] .= "&";
 
+				$key = str_replace(array("\n", "\r"), '', $key);
+				$val = str_replace(array("\n", "\r"), '', $val);
 				$_SESSION['_config']['oldlocation'] .= "$key=$val";
  			}
 			$_SESSION['_config']['oldlocation'] = substr($_SERVER['SCRIPT_NAME'], 1)."?".$_SESSION['_config']['oldlocation'];
@@ -144,6 +146,8 @@
 			if($_SESSION['_config']['oldlocation'])
 				$_SESSION['_config']['oldlocation'] .= "&";
 
+			$key = str_replace(array("\n", "\r"), '', $key);
+			$val = str_replace(array("\n", "\r"), '', $val);
 			$_SESSION['_config']['oldlocation'] .= "$key=$val";
 		}
 		$_SESSION['_config']['oldlocation'] = substr($_SERVER['SCRIPT_NAME'], 1)."?".$_SESSION['_config']['oldlocation'];