diff -aur web-cyradm-0.5.4/browseaccounts.php web-cyradm.patched/browseaccounts.php
--- web-cyradm-0.5.4/browseaccounts.php	2003-08-07 13:55:20.000000000 -0700
+++ web-cyradm.patched/browseaccounts.php	2004-04-07 10:13:47.000000000 -0700
@@ -204,7 +204,7 @@
 						<td valign="middle">
 							<?php
 							if ($DOMAIN_AS_PREFIX){
-								$quota = $cyr_conn->getquota("user/" . $username);
+								$quota = $cyr_conn->getquota("user." . $username);
 							} else {
 								$quota = $cyr_conn->getquota("user." . $username);
 							}
diff -aur web-cyradm-0.5.4/deleteaccount.php web-cyradm.patched/deleteaccount.php
--- web-cyradm-0.5.4/deleteaccount.php	2004-01-14 13:07:26.000000000 -0800
+++ web-cyradm.patched/deleteaccount.php	2004-04-07 10:11:57.000000000 -0700
@@ -94,7 +94,7 @@
 
 
 				if ($DOMAIN_AS_PREFIX) {
-					print $cyr_conn->deletemb("user/".$username);
+					print $cyr_conn->deletemb("user.".$username);
 				} else {
 						print $cyr_conn->deletemb("user.".$username);
 				}
diff -aur web-cyradm-0.5.4/deletedomain.php web-cyradm.patched/deletedomain.php
--- web-cyradm-0.5.4/deletedomain.php	2003-08-07 13:55:20.000000000 -0700
+++ web-cyradm.patched/deletedomain.php	2004-04-07 10:13:47.000000000 -0700
@@ -109,7 +109,7 @@
 
 						# And also delete the Usermailboxes from the cyrus system
 						if ($DOMAIN_AS_PREFIX){
-							print $cyr_conn->deletemb("user/".$username);
+							print $cyr_conn->deletemb("user.".$username);
 						} else {
 							print $cyr_conn->deletemb("user.".$username);
 						}
diff -aur web-cyradm-0.5.4/editaccount.php web-cyradm.patched/editaccount.php
--- web-cyradm-0.5.4/editaccount.php	2003-08-07 13:55:20.000000000 -0700
+++ web-cyradm.patched/editaccount.php	2004-04-07 10:13:47.000000000 -0700
@@ -138,7 +138,7 @@
 						<td valign="middle" rowspan="<?php echo $cnt;?>">
 							<?php
 							if ($DOMAIN_AS_PREFIX){
-								$quota = $cyr_conn->getquota("user/" . $username);
+								$quota = $cyr_conn->getquota("user." . $username);
 							} else {
 								$quota = $cyr_conn->getquota("user." . $username);
 							}
diff -aur web-cyradm-0.5.4/newaccount.php web-cyradm.patched/newaccount.php
--- web-cyradm-0.5.4/newaccount.php	2003-08-14 11:58:12.000000000 -0700
+++ web-cyradm.patched/newaccount.php	2004-04-07 10:13:47.000000000 -0700
@@ -187,9 +187,9 @@
 				$prefix		= $domain;
 				$username	= $email;
 				if ($freenames!="YES") {
-				    $username = $username . "." . $domain;
+				    $username = $username . "@" . $domain;
 				}
-				$seperator	= '/';
+				$seperator	= '.';
 			} else {
 				$seperator	= '.';
 			}
@@ -217,11 +217,14 @@
 
 				$result=$handle->query($query3);
 
-				$query4 = "INSERT INTO virtual (alias, dest, username, status) values ( '" . $email . "@" . $domain . "' , '$username' , '$username' , '1')";
-
-				$result2 = $handle->query($query4);
+//  No need for virtual with the new virtual hosting capabilities in cyrus
+//
+//				$query4 = "INSERT INTO virtual (alias, dest, username, status) values ( '" . $email . "@" . $domain . "' , '$username' , '$username' , '1')";
+//
+//				$result2 = $handle->query($query4);
 
-				if ($result and $result2){
+//				if ($result and $result2){
+				if ($result){
 					?>
 					<h3>
 						<?php print _("Account successfully added to the Database");?>:
@@ -231,7 +234,6 @@
 					</h3>
 					<?php
 				}
-
 				$result=$cyr_conn->createmb("user" . $seperator . $username);
 
 				if ($result){
diff -aur web-cyradm-0.5.4/search.php web-cyradm.patched/search.php
--- web-cyradm-0.5.4/search.php	2003-11-30 04:13:43.000000000 -0800
+++ web-cyradm.patched/search.php	2004-04-07 10:13:47.000000000 -0700
@@ -208,7 +208,7 @@
 		print $username;
 		print "</td>\n<td>";
                 if ($DOMAIN_AS_PREFIX){
-                    $quota = $cyr_conn->getquota("user/" . $username);
+                    $quota = $cyr_conn->getquota("user." . $username);
                 } else {
                     $quota = $cyr_conn->getquota("user." . $username);
                 }
diff -aur web-cyradm-0.5.4/setquota.php web-cyradm.patched/setquota.php
--- web-cyradm-0.5.4/setquota.php	2003-08-07 13:55:20.000000000 -0700
+++ web-cyradm.patched/setquota.php	2004-04-07 10:13:47.000000000 -0700
@@ -16,7 +16,7 @@
 
 			$_sep = '.';
 			if ($DOMAIN_AS_PREFIX) {
-				$_sep = '/';
+				$_sep = '.';
 			}
 			$q = $cyr_conn->getquota("user" . $_sep . $username);