--- web-cyradm-HEAD/newaccount.php      Thu Jan 26 11:41:01 2006
+++ web-cyradm/newaccount.php   Thu Jan 26 07:07:52 2006
@@ -133,7 +133,7 @@
                                        // START Andreas Kreisl : freenames
                                        if ($freenames=="YES"){
                                                $lastaccount = sprintf("%04d",$cnt);
-                                               $lastaccount = $prefix . $lastaccount;
+                               //              $lastaccount = $prefix . $lastaccount;
                                        } else {
                                                $lastaccount = $prefix."0000";
                                                if ($cnt > 0){
@@ -237,7 +237,8 @@
                } elseif (!empty($_POST['confirmed'])){

                        if ($DOMAIN_AS_PREFIX){
-                               $username = $_POST['email'].".".$_POST['domain'];
+                               //$username = $_POST['email'].".".$_POST['domain'];
+                               $username = $_POST['email'];
                                $seperator = '/';
                        } else {
                                $username = $_POST['username'];