diff --git a/linux/map.jinja b/linux/map.jinja
index a969268..28994cb 100644
--- a/linux/map.jinja
+++ b/linux/map.jinja
@@ -32,7 +32,7 @@
         'utc': true,
         'user': {},
         'group': {},
-        'create_default_group_for_user': false,
+        'create_default_group_for_user': true,
         'job': {},
         'limit': {},
         'locale': {},
diff --git a/linux/system/user.sls b/linux/system/user.sls
index 0eb7cb4..b8fa13c 100644
--- a/linux/system/user.sls
+++ b/linux/system/user.sls
@@ -30,7 +30,7 @@
       {%- endfor %}
 
       {%- if user.gid is not defined %}
-        {%- if name not in existing_groups|map(attribute="name") and system.get('create_default_group_for_user', False) %}
+        {%- if name not in existing_groups|map(attribute="name") and user.get('create_default_group', system.get('create_default_group_for_user', True)) %}
 system_group_{{ name }}:
   group.present:
   - name: {{ name }}
@@ -55,7 +55,7 @@
       {% endif %}
       {%- if user.gid is defined and user.gid %}
   - gid: {{ user.gid }}
-      {%- elif name in existing_groups|map(attribute="name") or system.get('create_default_group_for_user', False) %}
+      {%- elif name in existing_groups|map(attribute="name") or user.get('create_default_group', system.get('create_default_group_for_user', True)) %}
   - gid_from_name: true
       {%- else %}
   - gid: 65534