diff --git a/include/auth.php b/include/auth.php
index 6a50362d65..e30b94d2e3 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -71,8 +71,8 @@ else {
 			$a->cid = $r[0]['id'];
 			$_SESSION['cid'] = $a->cid;
 		}
-
-
+		if(($a->module !== 'home') && isset($_SESSION['return_url']))
+			goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
 	}
 }
 
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index ea176b7056..57d6ec5e93 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -97,7 +97,9 @@ blockquote:before {
 
 #sysmsg {
 	width: 600px;
+	margin-bottom: 10px;
 }
+
 #top-margin {
 	height: 20px;
 }