diff --git a/Scripts/sogo-init.d-debian b/Scripts/sogo-init.d-debian
index 57748d52e..24bf28d34 100755
--- a/Scripts/sogo-init.d-debian
+++ b/Scripts/sogo-init.d-debian
@@ -44,18 +44,18 @@ if [ ! -x $DAEMON ]; then
  exit 1
 fi
 
-if [ `/usr/bin/stat /var/run/sogo -c %U` != "sogo" ]; then
- echo "/var/run/sogo is not owned by the sogo user."
+if [ `/usr/bin/stat /var/run/sogo -c %U` != $USER ]; then
+ echo "/var/run/sogo is not owned by the ${USER}."
  exit 1
 fi
 
-if [ `/usr/bin/stat /var/spool/sogo -c %U` != "sogo" ]; then
- echo "/var/spool/sogo is not owned by the sogo user."
+if [ `/usr/bin/stat /var/spool/sogo -c %U` != $USER ]; then
+ echo "/var/spool/sogo is not owned by the ${USER}."
  exit 1
 fi
 
-if [ `/usr/bin/stat /var/log/sogo -c %U` != "sogo" ]; then
- echo "/var/log/sogo is not owned by the sogo user."
+if [ `/usr/bin/stat /var/log/sogo -c %U` != $USER ]; then
+ echo "/var/log/sogo is not owned by the ${USER}."
  exit 1
 fi
 
diff --git a/Scripts/sogod-wrapper b/Scripts/sogod-wrapper
index f834e7f98..bb2eeb5be 100755
--- a/Scripts/sogod-wrapper
+++ b/Scripts/sogod-wrapper
@@ -40,7 +40,9 @@ else
     exit 1
 fi
 
-if [ -x $GNUSTEP_LOCAL_ADMIN_TOOLS/sogod ]; then
+if [ -x $HOME/$GNUSTEP_USER_DIR_ADMIN_TOOLS/sogod ]; then
+    sogod="$HOME/$GNUSTEP_USER_DIR_ADMIN_TOOLS/sogod"
+elif [ -x $GNUSTEP_LOCAL_ADMIN_TOOLS/sogod ]; then
     sogod="$GNUSTEP_LOCAL_ADMIN_TOOLS/sogod"
 elif [ -x $GNUSTEP_SYSTEM_ADMIN_TOOLS/sogod ]; then
     sogod="$GNUSTEP_SYSTEM_ADMIN_TOOLS/sogod"