--- a/commands/vaddusers.cc	Sun Jan 20 00:12:17 2008 +0100
+++ b/commands/vaddusers.cc	Sun Jan 20 00:22:09 2008 +0100
@@ -21,7 +21,7 @@
 #include "mystring/mystring.h"
 #include "misc/pwcrypt.h"
 #include "config/configrc.h"
-#include "cli/cli.h"
+#include "cli++/cli++.h"
 #include "vcommand.h"
 
 const char* cli_program = "vaddusers";
@@ -100,9 +100,8 @@
   }
   {
     mystring maildir = domain.userdir(user);
-    vpwentry vpw(user, pwcrypt(pass), maildir, 0);
-    vpw.set_defaults(true, true);
-    response resp = domain.set(&vpw, true, maildir);
+    vpwentry vpw(user, pwcrypt(pass), maildir, 0, true);
+    response resp = domain.set(&vpw, true);
     if(!resp) {
       errors++;
       if(!o_quiet)
@@ -126,8 +125,7 @@
 	     << "' already exists, skipping." << endl;
       continue;
     }
-    vpwentry vpw(alias, "*", 0, user);
-    vpw.set_defaults(true, true);
+    vpwentry vpw(alias, "*", 0, user, false);
     response resp = domain.set(&vpw, true);
     if(!resp) {
       fout << endl;