diff --git a/users/init.sls b/users/init.sls
index a4f6cba..eaa09d4 100644
--- a/users/init.sls
+++ b/users/init.sls
@@ -49,11 +49,9 @@ include:
 
 {% for group in user.get('groups', []) %}
 users_{{ name }}_{{ group }}_group:
-  group.present:
+  group:
     - name: {{ group }}
-    {% if group == 'sudo' %}
-    - system: True
-    {% endif %}
+    - present
 {% endfor %}
 
 users_{{ name }}_user:
@@ -122,17 +120,7 @@ users_{{ name }}_user:
     - createhome: False
     {% endif %}
     {% if 'expire' in user -%}
-        {% if grains['kernel'].endswith('BSD') and
-            user['expire'] < 157766400 %}
-        {# 157762800s since epoch equals 01 Jan 1975 00:00:00 UTC #}
-    - expire: {{ user['expire'] * 86400 }}
-        {% elif grains['kernel'] == 'Linux' and
-            user['expire'] > 84006 %}
-        {# 2932896 days since epoch equals 9999-12-31 #}
-    - expire: {{ (user['expire'] / 86400) | int}}
-        {% else %}
     - expire: {{ user['expire'] }}
-        {% endif %}
     {% endif -%}
     - remove_groups: {{ user.get('remove_groups', 'False') }}
     - groups:
@@ -156,7 +144,6 @@ users_{{ name }}_user:
   {% if 'ssh_keys' in user or
       'ssh_auth' in user or
       'ssh_auth_file' in user or
-      'ssh_auth_pillar' in user or
       'ssh_auth.absent' in user or
       'ssh_config' in user %}
 user_keydir_{{ name }}:
@@ -209,7 +196,7 @@ users_authorized_keys_{{ name }}:
   file.managed:
     - name: {{ home }}/.ssh/authorized_keys
     - user: {{ name }}
-    - group: {{ user_group }}
+    - group: {{ name }}
     - mode: 600
 {% if 'ssh_auth_file' in user %}
     - contents: |
@@ -273,7 +260,7 @@ users_ssh_auth_source_{{ name }}_{{ loop.index0 }}:
     - user: {{ name }}
     - source: {{ pubkey_file }}
     - require:
-        - file: users_{{ name }}_user
+        - file: user_keydir_{{ name }}
         - user: users_{{ name }}_user
 {% endfor %}
 {% endif %}