diff --git a/roles/postfix/templates/aliases.j2 b/roles/postfix/templates/aliases.j2
index 9d96228744af3849a68668e6a559fcc7eecf06bc..e9eb21cc332155035717b0c1ff4fef0e1f0b47f5 100644
--- a/roles/postfix/templates/aliases.j2
+++ b/roles/postfix/templates/aliases.j2
@@ -12,7 +12,7 @@ postmaster: admins
 webmaster: admins
 root: admins
 
-{% if postfix_additional_admin_aliases %}
+{% if postfix_additional_admin_aliases is defined and postfix_additional_admin_aliases%}
 # additional admin aliases
 {% for alias in postfix_additional_admin_aliases %}
 {{ alias }}: admins
diff --git a/update-users.yml b/update-users.yml
index 28f99d8478fc03f6366c3c485ede000716154f74..10625e830cee1bf878f0d7c524a533ec87d19399 100644
--- a/update-users.yml
+++ b/update-users.yml
@@ -7,3 +7,20 @@
   become: yes
   roles:
    - users
+
+- name: update user admin email aliases
+  hosts: all
+  become: yes
+  tasks:
+   - name: load user info
+     include_vars:
+       file: "files/users/users.yml"
+       name: "user_info"
+   - name: create aliases
+     template:
+       src: "roles/postfix/templates/aliases.j2"
+       dest: "/etc/aliases"
+     notify: newaliases
+  handlers:
+   - name: newaliases
+     command: newaliases