diff --git a/calamares/modules/finished.conf b/calamares/modules/finished.conf
index f93acb5..b7dcd15 100644
--- a/calamares/modules/finished.conf
+++ b/calamares/modules/finished.conf
@@ -1,4 +1,4 @@
 ---
 restartNowEnabled: true
 restartNowChecked: false
-restartNowCommand: "systemctl -i reboot"
+restartNowCommand: "/bin/systemctl -i reboot"
diff --git a/calamares/modules/users.conf b/calamares/modules/users.conf
index aab7a40..2c00e4f 100644
--- a/calamares/modules/users.conf
+++ b/calamares/modules/users.conf
@@ -3,9 +3,11 @@ userGroup:      users
 defaultGroups:
     - lp
     - video
-    - network
-    - storage
-    - wheel
     - audio
+    - filesharing
+    - sysadmin
+    - packager
+    - nopermfs
+    - lpadmin
 autologinGroup: autologin
 sudoersGroup:   wheel