diff --git a/jenkins/files/config.xml.user b/jenkins/files/config.xml.user
index c53167d..b28a87f 100644
--- a/jenkins/files/config.xml.user
+++ b/jenkins/files/config.xml.user
@@ -29,7 +29,7 @@
       <insensitiveSearch>false</insensitiveSearch>
     </hudson.search.UserSearchProperty>
     <hudson.security.HudsonPrivateSecurityRealm_-Details>
-      <passwordHash>{{ salt['jenkins_hash.encode_password'](user.password) }}</passwordHash>
+      <passwordHash>#jbcrypt:{{ salt['jenkins_hash.encode_password'](user.password) }}</passwordHash>
     </hudson.security.HudsonPrivateSecurityRealm_-Details>
     {%- if user.public_keys is defined %}
     <org.jenkinsci.main.modules.cli.auth.ssh.UserPropertyImpl>
diff --git a/jenkins/master/user.sls b/jenkins/master/user.sls
index 1c262ce..d8df637 100644
--- a/jenkins/master/user.sls
+++ b/jenkins/master/user.sls
@@ -16,5 +16,11 @@
       user_name: "{{ user_name }}"
   - watch_in:
     - service: jenkins_master_service
+  - unless: test -e {{ master.home }}/users/{{ user_name }}/.config_created
+
+{{ master.home }}/users/{{ user_name }}/.config_created:
+  file.touch:
+  - require:
+    - file: {{ master.home }}/users/{{ user_name }}/config.xml
 
 {%- endfor %}