diff -r 30113bfbe723 -r b3afb9f1e801 lib/vdomain/deluser.cc
--- a/lib/vdomain/deluser.cc	Sun Jan 20 00:12:17 2008 +0100
+++ b/lib/vdomain/deluser.cc	Sun Jan 20 00:22:09 2008 +0100
@@ -25,11 +25,11 @@
   autodelete<vpwentry> vpw = table()->getbyname(user);
   if(!vpw)
     RETURN(err, "User does not exist");
-  if(!del_mailbox && !!vpw->mailbox)
+  if(!del_mailbox && vpw->has_mailbox)
     RETURN(err, "User has a mailbox");
   if(!table()->del(vpw->name))
     RETURN(err, "Couldn't delete user from the password file");
-  if(!!vpw->mailbox && !delete_directory(vpw->mailbox))
-    RETURN(err, "Couldn't delete user's mail directory");
+  if(!!vpw->directory && !delete_directory(vpw->directory))
+    RETURN(err, "Couldn't delete user's directory");
   RETURN(ok, "Deleted user.");
 }