diff --git a/login.php b/login.php
index 5cb49b05db..97a7aad5e2 100755
--- a/login.php
+++ b/login.php
@@ -359,6 +359,8 @@ else
 			}
 			else
 			{
+				// commiting the session, before redirecting might fix racecondition in session creation
+				$GLOBALS['egw']->session->commit_session();
 				egw::redirect_link($forward,$extra_vars);
 			}
 		}