diff --git a/login.php b/login.php
index 0626febe6b..821d16c040 100755
--- a/login.php
+++ b/login.php
@@ -384,7 +384,7 @@
 	if(!$GLOBALS['egw_info']['server']['show_domain_selectbox'])
 	{
 		/* trick to make domain section disapear */
-		$tmpl->set_var('domain_selection','');
+		$tmpl->set_var('domain_selection','<input type="hidden" name="logindomain" value="'.htmlspecialchars($GLOBALS['egw_info']['user']['domain']).'" />');
 	}
 
 	foreach($_GET as $name => $value)
diff --git a/logout.php b/logout.php
index e8cfd0ecb4..d7c60ba6de 100755
--- a/logout.php
+++ b/logout.php
@@ -64,5 +64,5 @@
 		$GLOBALS['egw']->session->phpgw_setcookie(EGW_PHPSESSID);
 	}
 
-	$GLOBALS['egw']->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=1');
+	$GLOBALS['egw']->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=1&domain='.$GLOBALS['egw_info']['user']['domain']);
 ?>
diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index 1e042284cf..4571caeeaa 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -107,7 +107,7 @@
 	}
 	else	// on "normal" pageview
 	{
-		$GLOBALS['egw_info']['user']['domain'] = $_REQUEST['domain'];
+		$GLOBALS['egw_info']['user']['domain'] = get_var('domain',array('GET','COOKIE'),false);
 	}
 
 	if (@isset($GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]))