diff --git a/default/sysstat b/default/sysstat
index dfeb7e01..17fb007c 100644
--- a/default/sysstat
+++ b/default/sysstat
@@ -6,5 +6,5 @@
 # Should sadc collect system activity informations? Valid values
 # are "true" and "false". Please do not put other values, they
 # will be overwritten by debconf!
-ENABLED="false"
+ENABLED="true"
 
diff --git a/group- b/group-
index b5a3f809..1ac41888 100644
--- a/group-
+++ b/group-
@@ -66,6 +66,5 @@ postgrey:x:124:
 amavis:x:125:
 vmail:x:5000:
 cmk-agent:x:998:
-wheel:x:1004:caelebfi,pi
-pi:x:5001:
+wheel:x:1004:caelebfi
 unbound:x:126:
diff --git a/gshadow b/gshadow
index 27943d83..a89802a0 100644
--- a/gshadow
+++ b/gshadow
@@ -66,3 +66,5 @@ postgrey:!::
 amavis:!::
 cmk-agent:!::
 unbound:!::
+vmail:x::
+wheel:x::caelebfi
diff --git a/gshadow- b/gshadow-
index b6a8e77f..27943d83 100644
--- a/gshadow-
+++ b/gshadow-
@@ -65,5 +65,4 @@ opendkim:!::
 postgrey:!::
 amavis:!::
 cmk-agent:!::
-pi:!::
 unbound:!::