diff --git a/debian/sogo.postrm b/debian/sogo.postrm
index 2abe80bd0..9bed33fa5 100644
--- a/debian/sogo.postrm
+++ b/debian/sogo.postrm
@@ -19,6 +19,9 @@ case "$1" in
         if test "x$1" == "xpurge"
         then
             userdel -r sogo || true
+            rm -rf /var/spool/sogo
+            rm -rf /var/log/sogo
+            rm -rf /var/run/sogo
         fi
         ;;
 
diff --git a/debian/sogo.preinst b/debian/sogo.preinst
index 24864f5d0..384bffc2a 100644
--- a/debian/sogo.preinst
+++ b/debian/sogo.preinst
@@ -13,16 +13,17 @@ set -e
 
 if test "x$1" == "xinstall" && test -z "$2"
 then
-  if ! id sogo 2> /dev/null; then
+  if ! id sogo 1> /dev/null 2>&1; then
     groupadd -f -K GID_MIN=100 -K GID_MAX=500 sogo
     useradd -d /home/sogo -g sogo -m -K UID_MIN=100 -K UID_MAX=500 -K PASS_MAX_DAYS=-1 -s /bin/bash sogo
   fi
 
   for dir in run spool log
   do
-    mkdir /var/$dir/sogo
-    chown sogo:sogo /var/$dir/sogo
-    chmod 750 /var/$dir/sogo
+    if ! test -d /var/$dir/sogo
+    then
+      install -m 750 -o sogo -g sogo -d /var/$dir/sogo
+    fi
   done
 fi