diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile
index 1962b342..d9295b6b 100755
--- a/src/freedombone-app-mailpile
+++ b/src/freedombone-app-mailpile
@@ -123,6 +123,9 @@ function remove_mailpile {
         fi
         function_check remove_ddns_domain
         remove_ddns_domain $MAILPILE_DOMAIN_NAME
+        deluser --remove-all-files mailpile
+    else
+        deluser mailpile
     fi
 
     remove_config_param MAILPILE_DOMAIN_NAME