diff --git a/ChangeLog b/ChangeLog
index f29512083..ede7e0895 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,6 +84,8 @@ danbarry
 - [core] safer handling of temporary files with open_basedir (thanks to Thijs Kinkhorst)
 + [lang] Czech update
 - bug #2066923 [display] Navi browse icon does not go to page 1 
+- patch #2075263 [auth] Single sign-on and cookie clearing,
+  thanks to Charles Suh - cws125
 
 2.11.9.0 (2008-08-28)
 - bug #2031221 [auth] Links to version number on login screen 
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 227340e83..432b66bd0 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -240,13 +240,13 @@ if (function_exists('get_magic_quotes_gpc') && -1 == version_compare(PHP_VERSION
 }
 
 /**
- * clean cookies on new install or upgrade
- * when changing something with increment the cookie version
+ * clean cookies on upgrade
+ * when changing something related to PMA cookies, increment the cookie version
  */
 $pma_cookie_version = 4;
 if (isset($_COOKIE)
- && (! isset($_COOKIE['pmaCookieVer'])
-  || $_COOKIE['pmaCookieVer'] < $pma_cookie_version)) {
+ && (isset($_COOKIE['pmaCookieVer'])
+  && $_COOKIE['pmaCookieVer'] < $pma_cookie_version)) {
     // delete all cookies
     foreach($_COOKIE as $cookie_name => $tmp) {
         PMA_removeCookie($cookie_name);