--- a/commands/vsetup.cc	Sun Jan 20 00:12:17 2008 +0100
+++ b/commands/vsetup.cc	Sun Jan 20 00:22:09 2008 +0100
@@ -20,7 +20,7 @@
 #include "fdbuf/fdbuf.h"
 #include "config/configrc.h"
 #include "misc/stat_fns.h"
-#include "cli/cli.h"
+#include "cli++/cli++.h"
 #include "misc/exec.h"
 #include "vcommand.h"
 
@@ -121,8 +121,7 @@
 	   << "' already exists, skipping.\n";
     return true;
   }
-  vpwentry vpw(alias, "*", 0, dest);
-  vpw.set_defaults(true, true);
+  vpwentry vpw(alias, "*", domain.userdir(alias), dest, true);
   response resp = domain.set(&vpw, true);
   if(!resp) {
     if(!o_quiet)