diff --git a/login.php b/login.php
index 2a37f50e20..3baed41743 100755
--- a/login.php
+++ b/login.php
@@ -47,10 +47,7 @@
     global $phpgw_info, $code, $lastloginid, $login;
     /* This needs to be this way, because if someone doesnt want to use cookies, we shouldnt sneak one in */
     if ($code != 5 && (isset($phpgw_info["server"]["usecookies"]) && $phpgw_info["server"]["usecookies"])){
-      if (!empty($login)) {
-        SetCookie("lastloginid",$login, time() + (24 * 3600 * 14),"/");
-      }
-      return $lastloginid;
+       return $lastloginid;
     }
   }
 
diff --git a/logout.php b/logout.php
index 0c4f634e81..166c044304 100755
--- a/logout.php
+++ b/logout.php
@@ -58,6 +58,7 @@
   }
   Setcookie("sessionid");
   Setcookie("kp3");
+  Setcookie("domain");
 
   Header("Location: " . $phpgw_info["server"]["webserver_url"] . "/login.php?cd=1");
 ?>
\ No newline at end of file