diff --git a/kibana/files/kibana.default b/kibana/files/kibana.default
new file mode 100644
index 0000000..55968c3
--- /dev/null
+++ b/kibana/files/kibana.default
@@ -0,0 +1,5 @@
+user="kibana"
+group="root"
+chroot="/"
+chdir="/"
+nice=""
\ No newline at end of file
diff --git a/kibana/files/kibana.init b/kibana/files/kibana.init
index d19ba7c..0bc2dd6 100755
--- a/kibana/files/kibana.init
+++ b/kibana/files/kibana.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Init script for kibana
-# Maintained by 
+# From Kibana package
 # Generated by pleaserun.
 # Implemented based on LSB Core 3.1:
 #   * Sections: 20.2, 20.3
@@ -11,7 +11,7 @@
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: 
+# Short-Description:
 # Description:       no description given
 ### END INIT INFO
 
@@ -44,12 +44,12 @@
 
 
   # Setup any environmental stuff beforehand
-  
+
 
   # Run the program!
-  
+
   chroot --userspec "$user":"$group" "$chroot" sh -c "
-    
+
     cd \"$chdir\"
     exec \"$program\" $args
   " >> /var/log/kibana/kibana.stdout 2>> /var/log/kibana/kibana.stderr &
@@ -133,7 +133,7 @@
     ;;
   stop) stop ;;
   force-stop) force_stop ;;
-  status) 
+  status)
     status
     code=$?
     if [ $code -eq 0 ] ; then
@@ -143,9 +143,9 @@
     fi
     exit $code
     ;;
-  restart) 
-    
-    stop && start 
+  restart)
+
+    stop && start
     ;;
   *)
     echo "Usage: $SCRIPTNAME {start|force-start|stop|force-start|force-stop|status|restart}" >&2
@@ -153,4 +153,4 @@
   ;;
 esac
 
-exit $?
+exit $?
\ No newline at end of file
diff --git a/kibana/server.sls b/kibana/server.sls
index 7a47212..fe4f5d3 100644
--- a/kibana/server.sls
+++ b/kibana/server.sls
@@ -27,12 +27,20 @@
   cmd.run:
   - name: chown kibana:kibana /opt/kibana-4.3.0-linux-x64 -R
 
+/etc/default/kibana:
+  file.managed:
+  - source: salt://kibana/files/kibana.default
+  - mode: 755
+  - template: jinja
+  - require:
+    - user: kibana_user
+  - watch_in:
+    - service: kibana_service
+
 /etc/init.d/kibana:
   file.managed:
   - source: salt://kibana/files/kibana.init
-  - user: kibana
-  - group: kibana
-  - mode: 700
+  - mode: 755
   - template: jinja
   - require:
     - user: kibana_user