diff --git a/ChangeLog b/ChangeLog
index 46650bcbe..5857c9e2d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-03-13 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/Config.class.php, /common.lib.php: bug #1445120, 
+      cookie login not working on IIS
+
 2006-03-10 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_tbl.lib.php: reactivate in-line image display
     * transformation_wrapper.php: bug #1444121, octetstream download fails
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 718d51b8c..dc6e3b71f 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -231,7 +231,10 @@ class PMA_Config
     function checkWebServer()
     {
         if (getenv('SERVER_SOFTWARE')
-          && stristr(getenv('SERVER_SOFTWARE'), 'Microsoft/IIS')) {
+          // some versions return Microsoft-IIS, some Microsoft/IIS
+          // we could use a preg_match() but it's slower
+          && stristr(getenv('SERVER_SOFTWARE'), 'Microsoft')
+          && stristr(getenv('SERVER_SOFTWARE'), 'IIS')) {
             $this->set('PMA_IS_IIS', 1);
         } else {
             $this->set('PMA_IS_IIS', 0);
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index a0ca40ee9..d376565ed 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1050,7 +1050,12 @@ if (!defined('PMA_MINIMUM_COMMON')) {
                     header('Location: ' . $uri . $separator . SID);
                 }
             } else {
-                header('Location: ' . $uri);
+                session_write_close();
+                if (PMA_IS_IIS) {
+                    header('Refresh: 0; ' . $uri);
+                } else {
+                    header('Location: ' . $uri);
+                }
             }
         }
     }