diff --git a/server/Makefile b/server/Makefile
index 32374148..ea67e430 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -111,7 +111,7 @@ else
 install:
 	$(MAKE) adduser
 	$(MAKE) installfiles
-	install -g nogroup -o snapserver -d /var/run/$(BIN)
+	install -g snapserver -o snapserver -d /var/run/$(BIN)
 
 	@if [[ `systemctl` =~ -\.mount ]]; then \
 		$(MAKE) installsystemd; \
@@ -150,7 +150,8 @@ installbsd:
 
 adduser:
 	@if ! getent passwd snapserver >/dev/null; then \
-		adduser --quiet --ingroup nogroup --system --no-create-home --home /var/lib/snapserver snapserver; \
+		addgroup --quiet --system snapserver; \
+		adduser --quiet --ingroup snapserver --system --no-create-home --home /var/lib/snapserver snapserver; \
 	fi; \
 
 
@@ -208,5 +209,6 @@ uninstallsystemd:
 	systemctl daemon-reload; \
 
 deluser:
-	@deluser --quiet --system snapserver > /dev/null || true
+	@deluser --quiet --system snapserver > /dev/null || true; \
+	delgroup --quiet --system snapserver > /dev/null || true
 
diff --git a/server/debian/snapserver.bsd b/server/debian/snapserver.bsd
index 51cb7b50..eb1b9b1c 100644
--- a/server/debian/snapserver.bsd
+++ b/server/debian/snapserver.bsd
@@ -24,7 +24,7 @@ load_rc_config $name
 
 command=/usr/local/bin/${name}
 pidfile="/var/run/${name}/pid"
-                                            
+
 start_cmd=snapserver_start
 
 
diff --git a/server/debian/snapserver.init b/server/debian/snapserver.init
index 04f477ab..8961a977 100755
--- a/server/debian/snapserver.init
+++ b/server/debian/snapserver.init
@@ -48,7 +48,7 @@ do_start()
 	PIDDIR=$(dirname "$PIDFILE")
 	if [ ! -d "$PIDDIR" ]; then
 			mkdir -m 0755 $PIDDIR
-			chown snapserver:nogroup $PIDDIR
+			chown snapserver:snapserver $PIDDIR
 	fi
 
 	# Return
diff --git a/server/debian/snapserver.postinst b/server/debian/snapserver.postinst
index a579ba62..9f34003e 100644
--- a/server/debian/snapserver.postinst
+++ b/server/debian/snapserver.postinst
@@ -9,7 +9,8 @@ VERSION="$2"
 if [ "$ACTION" = "configure" ]; then
 	# add the snapserver user
 	if ! getent passwd snapserver >/dev/null; then
-		adduser --quiet --ingroup nogroup --system --no-create-home snapserver
+		addgroup --quiet --system snapserver
+		adduser --quiet --ingroup snapserver --system --no-create-home snapserver
 	fi
 fi
 
diff --git a/server/debian/snapserver.postrm b/server/debian/snapserver.postrm
index 275fac56..d3700680 100644
--- a/server/debian/snapserver.postrm
+++ b/server/debian/snapserver.postrm
@@ -12,6 +12,7 @@ if [ "$1" = "purge" ]; then
 	done
 
 	deluser --quiet --system snapserver > /dev/null || true
+	delgroup --quiet --system snapserver > /dev/null || true
 fi
 
 #DEBHELPER#
diff --git a/server/snapServer.cpp b/server/snapServer.cpp
index 59c2b0b3..94c3ad66 100644
--- a/server/snapServer.cpp
+++ b/server/snapServer.cpp
@@ -144,7 +144,7 @@ int main(int argc, char* argv[])
 		if (daemonOption.isSet())
 		{
 #ifdef HAS_DAEMON
-			daemonize("snapserver", "nogroup", "/var/run/snapserver/pid");
+			daemonize("snapserver", "snapserver", "/var/run/snapserver/pid");
 			if (processPriority < -20)
 				processPriority = -20;
 			else if (processPriority > 19)