diff --git a/header.inc.php.sample b/header.inc.php.sample
index eb8b4b7379..92e24b5473 100644
--- a/header.inc.php.sample
+++ b/header.inc.php.sample
@@ -29,9 +29,10 @@
   $phpgw_info["server"]["db_name"] = "phpgroupware";
   $phpgw_info["server"]["db_user"] = "phpgroupware";
   $phpgw_info["server"]["db_pass"] = "your_password";
+  /* Look at the README file */
   $phpgw_info["server"]["db_type"] = "mysql"; //mysql, pgsql (for postgresql), oracle, 
                                               //msql (not tested), mssql (not tested), sybase (not tested), or odbc (not tested)
-
+  
   /* This will limit who is allowed to make configuration modifcations */
   $phpgw_info["server"]["config_passwd"] = "changeme";    
 
@@ -47,6 +48,17 @@
    */
   $phpgw_info["server"]["mcrypt_iv"] = "cwjasud83l;la-0d.e/lc;[-%kl)ls,lf0;sa-;921kx;90flwl,skfcujd,wsodsp";
 
+  /* Use this for supporting different domains using this single install */
+  /* (ignore if you are only supporting a single domain)*/
+  $phpgw_info["multiable_domains"] = False; //Set to True and create an array for each domain.
+  $domains["domain1.com"] = array (
+    "db_host" => "localhost", 
+    "db_name" => "phpgw_domain1", 
+    "db_user" => "phpgroupware", 
+    "db_pass" => "their_password", 
+    "db_type" => "mysql",
+    "config_passwd" => "changeme"
+  );
 
   /**************************************************************************\
   * Do not edit these lines                                                  *
diff --git a/setup/inc/setup_auth.inc.php b/setup/inc/setup_auth.inc.php
index 309a0f015f..0d174f1f42 100644
--- a/setup/inc/setup_auth.inc.php
+++ b/setup/inc/setup_auth.inc.php
@@ -41,7 +41,12 @@
      }
      echo "  <tr bgcolor=\"e6e6e6\">\n";
      echo "    <td><form action='".$PHP_SELF."' method='POST'>\n";
-     echo "      <input type='password' name='FormPW' value=''>\n";
+     if ($phpgw_info["multiable_domains"] == True){
+      echo "      <input type='text' name='domain' value=''><br>\n";
+      echo "      <input type='password' name='FormPW' value=''><br>\n";
+     }else{
+      echo "      <input type='password' name='FormPW' value=''>\n";
+     }
      echo "      <input type='submit' name='Login' value='Login'>\n";
      echo "    </form></td>\n";
      echo "  </tr>\n";