diff --git a/users/bashrc.sls b/users/bashrc.sls
index fc268f4..4d4ca4d 100644
--- a/users/bashrc.sls
+++ b/users/bashrc.sls
@@ -3,10 +3,11 @@ include:
   - users
 
 {% for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
+{%- set current = salt.user.info(name) -%}
 {%- if user == None -%}
 {%- set user = {} -%}
 {%- endif -%}
-{%- set home = user.get('home', "/home/%s" % name) -%}
+{%- set home = user.get('home', current.get('home', "/home/%s" % name)) -%}
 {%- set manage = user.get('manage_bashrc', False) -%}
 {%- if 'prime_group' in user and 'name' in user['prime_group'] %}
 {%- set user_group = user.prime_group.name -%}
diff --git a/users/profile.sls b/users/profile.sls
index b62c096..55ac8e2 100644
--- a/users/profile.sls
+++ b/users/profile.sls
@@ -3,10 +3,11 @@ include:
   - users
 
 {% for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
+{%- set current = salt.user.info(name) -%}
 {%- if user == None -%}
 {%- set user = {} -%}
 {%- endif -%}
-{%- set home = user.get('home', "/home/%s" % name) -%}
+{%- set home = user.get('home', current.get('home', "/home/%s" % name)) -%}
 {%- set manage = user.get('manage_profile', False) -%}
 {%- if 'prime_group' in user and 'name' in user['prime_group'] %}
 {%- set user_group = user.prime_group.name -%}
diff --git a/users/user_files.sls b/users/user_files.sls
index 95c1281..461628b 100644
--- a/users/user_files.sls
+++ b/users/user_files.sls
@@ -5,9 +5,10 @@ include:
 
 {% set userfile_dirs = salt['cp.list_master_dirs'](prefix='users/files/user/') -%}
 {%- for username, user in salt['pillar.get']('users', {}).items() if (user.absent is not defined or not user.absent) -%}
+{%- set current = salt.user.info(username) -%}
 {%- set user_files = salt['pillar.get'](('users:' ~ username ~ ':user_files'), {'enabled': False}) -%}
 {%- set user_group = salt['pillar.get'](('users:' ~ username ~ ':prime_group:name'), username) -%}
-{%- set user_home = salt['pillar.get'](('users:' ~ username ~ ':home'), '/home/' ~ username ) -%}
+{%- set user_home = salt['pillar.get'](('users:' ~ username ~ ':home'), current.get('home', '/home/' ~ username )) -%}
 {%- if user_files.enabled -%}
 
 {%- if user_files.source is defined -%}
diff --git a/users/vimrc.sls b/users/vimrc.sls
index e678bb6..5404738 100644
--- a/users/vimrc.sls
+++ b/users/vimrc.sls
@@ -4,10 +4,11 @@ include:
   - vim
 
 {% for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
+{%- set current = salt.user.info(name) -%}
 {%- if user == None -%}
 {%- set user = {} -%}
 {%- endif -%}
-{%- set home = user.get('home', "/home/%s" % name) -%}
+{%- set home = user.get('home', current.get('home', "/home/%s" % name)) -%}
 {%- set manage = user.get('manage_vimrc', False) -%}
 {%- if 'prime_group' in user and 'name' in user['prime_group'] %}
 {%- set user_group = user.prime_group.name -%}