diff --git a/_modules/jenkins_common.py b/_modules/jenkins_common.py
index c7446fa..348aa09 100644
--- a/_modules/jenkins_common.py
+++ b/_modules/jenkins_common.py
@@ -69,7 +69,7 @@
 
     logger.debug("Calling Jenkins script API with URL: %s", jenkins_url)
     req = requests.post('%s/scriptText' % jenkins_url,
-                        auth=(jenkins_user, jenkins_password),
+                        auth=(jenkins_user, jenkins_password) if jenkins_user else None,
                         data=req_data)
     ret["code"] = req.status_code
     ret["msg"] = req.text
diff --git a/_states/jenkins_theme.py b/_states/jenkins_theme.py
index c27b0a2..2a91c10 100644
--- a/_states/jenkins_theme.py
+++ b/_states/jenkins_theme.py
@@ -10,6 +10,7 @@
             if(!pd.cssUrl.equals("${css_url}") || !pd.jsUrl.equals("${js_url}")){
                 pd.cssUrl = "${css_url}"
                 pd.jsUrl = "${js_url}"
+                pd.save()
                 state="SUCCESS"
             }else{
                 state="EXISTS"
diff --git a/jenkins/client/_job_template.sls b/jenkins/client/_job_template.sls
index de4ba21..adce826 100644
--- a/jenkins/client/_job_template.sls
+++ b/jenkins/client/_job_template.sls
@@ -2,7 +2,7 @@
   {#- Matrix way, simulating behavior of Jenkins job builder, not fully
       supported at the moment #}
   {%- for param_name, params in job_template.get('param', {}).iteritems() %}
-    {%- set replacer = "{{" + param_name + "}}" %}
+    {%- set replacer = client.replacer.open + param_name + client.replacer.close %}
     {%- for param in params %}
       {%- set job_name = job_template.name|replace(replacer, param) %}
       {%- set job = job_template.template|yaml|replace(replacer, param)|load_yaml %}
@@ -19,7 +19,7 @@
       {#- You may think WTF hack is this but we can't update variables in
           inner scope to replace all parameters. But we can abuse lists for
           this purpose }:-) #}
-      {%- set replacer = "{{" + key + "}}" %}
+      {%- set replacer = client.replacer.open + key + client.replacer.close %}
       {%- do _job_name.append(_job_name|last|replace(replacer, value)) %}
       {%- do _job.append(_job|last|yaml|replace(replacer, value)|load_yaml) %}
     {%- endfor %}
diff --git a/jenkins/client/job.sls b/jenkins/client/job.sls
index 9375ad0..f9b1541 100644
--- a/jenkins/client/job.sls
+++ b/jenkins/client/job.sls
@@ -14,7 +14,7 @@
   {%- for job_template_name, job_template in client.get('job_template', {}).iteritems() %}
     {%- if job_template.get('enabled', true) %}
       {%- for param_name, params in job_template.get('param', {}).iteritems() %}
-        {%- set replacer = "{{" + param_name + "}}" %}
+        {%- set replacer = client.replacer.open + param_name + client.replacer.close %}
         {%- for param in params %}
           {%- set job_name = job_template.name|replace(replacer, param) %}
           {%- do jobs.append(job_name) %}
@@ -24,7 +24,7 @@
       {%- for job_params in job_template.get('jobs', []) %}
         {%- set job_name = job_template.name %}
         {%- for key, value in job_params.iteritems() %}
-          {%- set replacer = "{{" + key + "}}" %}
+          {%- set replacer = client.replacer.open + key + client.replacer.close %}
           {%- set job_name = job_name|replace(replacer, value) %}
           {%- do jobs.append(job_name) %}
         {%- endfor %}
diff --git a/jenkins/files/slave/default b/jenkins/files/slave/default
index cbd0065..7673d5d 100644
--- a/jenkins/files/slave/default
+++ b/jenkins/files/slave/default
@@ -53,4 +53,4 @@
 MAXOPENFILES=8192
 
 # Arguments to pass to jenkins slave on startup
-JENKINS_ARGS="-jnlpUrl ${JENKINS_URL}/computer/$JENKINS_HOSTNAME/slave-agent.jnlp -jnlpCredentials ${JENKINS_LOGIN}:${JENKINS_PASSWORD}"
+JENKINS_ARGS="-jnlpUrl ${JENKINS_URL}/computer/$JENKINS_HOSTNAME/slave-agent.jnlp -jnlpCredentials ${JENKINS_LOGIN}:${JENKINS_PASSWORD} -slaveLog /var/log/jenkins/java-${NAME}.log"
diff --git a/jenkins/map.jinja b/jenkins/map.jinja
index 4ded07f..1530282 100644
--- a/jenkins/map.jinja
+++ b/jenkins/map.jinja
@@ -76,6 +76,10 @@
         'dir': {
             'jenkins_source_root': '/var/cache/salt/minion/jenkins/source',
             'jenkins_jobs_root': '/var/cache/salt/minion/jenkins/jobs',
+        },
+        'replacer': {
+            'open': '{{',
+            'close': '}}',
         }
     },
 }, merge=pillar.jenkins.get('client', {})) %}