diff --git a/users/init.sls b/users/init.sls
index 2cf2af0..7929fc6 100644
--- a/users/init.sls
+++ b/users/init.sls
@@ -67,8 +67,8 @@ include:
 {%- endif -%}
 {%- set current = salt.user.info(name) -%}
 {%- set home = user.get('home', current.get('home', "/home/%s" % name)) -%}
-{%- set createhome = user.get('createhome') -%}
-
+{%- set createhome = user.get('createhome', current.get('createhome', users.get('createhome'))) -%}
+ 
 {%- if 'prime_group' in user and 'name' in user['prime_group'] %}
 {%- set user_group = user.prime_group.name -%}
 {%- else -%}