diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 44cc037cb7..5f5e9cc2eb 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -10,6 +10,9 @@
 		- Fixed a few problems with error reporting in the accounts section.
 		  Thanks mdean <mdean@kcnet.com>
 		- Renamed the webcal_entry.cal_create_by field to webcal_entry.cal_owner.
+		- Split out auth class, so that you can auth from anywhere and still store your accounts in sql or ldap.
+		- Added mail auth class, that will authenticate users against their email accounts
+		- Added virtual domain support. (The setup program is not properly working yet)
 
 [0.9.3] - Fixed the new user account form not returning the users firstname or last name when an
 	      error is reported.
diff --git a/setup/inc/setup_auth.inc.php b/setup/inc/setup_auth.inc.php
index ba0e6eb83a..0c4b14593f 100644
--- a/setup/inc/setup_auth.inc.php
+++ b/setup/inc/setup_auth.inc.php
@@ -27,7 +27,7 @@
 
   function loginForm($err="")
   {
- 	global $phpgw_info, $domain, $PHP_SELF;
+ 	global $phpgw_info, $domains, $SetupDomain, $SetupCookie, $FormDomain, $PHP_SELF;
  	
  	setup_header("Please login");
 
@@ -42,7 +42,7 @@
     echo "  <tr bgcolor=\"e6e6e6\">\n";
     echo "    <td><form action='".$PHP_SELF."' method='POST'>\n";
     if ($phpgw_info["multiable_domains"] == True){
-      echo "      <table><tr><td>Domain: </td><td><input type='text' name='domain' value=''></td></tr>\n";
+      echo "      <table><tr><td>Domain: </td><td><input type='text' name='FormDomain' value=''></td></tr>\n";
       echo "      <tr><td>Password: </td><td><input type='password' name='FormPW' value=''></td></tr></table>\n";
     }else{
       echo "      <input type='password' name='FormPW' value=''>\n";
@@ -56,7 +56,7 @@
 
   if (isset($FormPW)) {
     if ($phpgw_info["multiable_domains"] == True){
-      if ($FormPW != $domains[$domain]["config_passwd"]) {
+      if ($FormPW != $domains[$FormDomain]["config_passwd"]) {
         loginForm("Invalid password.");
         exit;
       }
@@ -91,6 +91,6 @@
   // Auth ok.
   setcookie("SetupCookie","$SetupCookie");
   if ($phpgw_info["multiable_domains"] == True){
-    setcookie("SetupDomain","$domain");
+    setcookie("SetupDomain","$FormDomain");
   }
 ?>
\ No newline at end of file