--- a/account.pm	Wed Aug 09 07:57:14 2006 +0000
+++ b/account.pm	Thu Aug 17 22:38:38 2006 +0000
@@ -95,6 +95,10 @@
     my $mailForwardingAddress = [split /,/, $Cf->forward || ""];
     my $pw = _mkpw($Cf->password || "{pwgen}");
 
+    if ($mailPrimaryAddress !~ /@/) {
+	$mailPrimaryAddress .= "@" . $Cf->default_domain;
+    }
+
 
     my $dn = "uid=$user,$ubase";
     my $r;