diff --git a/packaging/debian-multiarch/sogo.preinst b/packaging/debian-multiarch/sogo.preinst
index 384bffc2a..fc2d475bf 100644
--- a/packaging/debian-multiarch/sogo.preinst
+++ b/packaging/debian-multiarch/sogo.preinst
@@ -11,19 +11,16 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-if test "x$1" == "xinstall" && test -z "$2"
-then
+if [ "$1" == "install" ] || [ "$1" == "upgrade" ]; 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
+    groupadd -f -r sogo
+    useradd -d /var/lib/sogo -g sogo -c "SOGo daemon" -s /usr/sbin/nologin -M -r sogo
   fi
 
-  for dir in run spool log
-  do
-    if ! test -d /var/$dir/sogo
-    then
-      install -m 750 -o sogo -g sogo -d /var/$dir/sogo
-    fi
+  # create mandatory dirs and enforce owner/perms
+  for dir in lib log run spool; do
+    install -m 750 -o sogo -g sogo -d /var/$dir/sogo
   done
 fi
 
diff --git a/packaging/debian/sogo.preinst b/packaging/debian/sogo.preinst
index 384bffc2a..fc2d475bf 100644
--- a/packaging/debian/sogo.preinst
+++ b/packaging/debian/sogo.preinst
@@ -11,19 +11,16 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-if test "x$1" == "xinstall" && test -z "$2"
-then
+if [ "$1" == "install" ] || [ "$1" == "upgrade" ]; 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
+    groupadd -f -r sogo
+    useradd -d /var/lib/sogo -g sogo -c "SOGo daemon" -s /usr/sbin/nologin -M -r sogo
   fi
 
-  for dir in run spool log
-  do
-    if ! test -d /var/$dir/sogo
-    then
-      install -m 750 -o sogo -g sogo -d /var/$dir/sogo
-    fi
+  # create mandatory dirs and enforce owner/perms
+  for dir in lib log run spool; do
+    install -m 750 -o sogo -g sogo -d /var/$dir/sogo
   done
 fi