diff --git a/manifests/init.pp b/manifests/init.pp
index 88d077f..285d0fc 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,23 +15,40 @@
 # == Class: simpleproxy
 #
 class simpleproxy {
+  package { 'mysql-proxy':
+    ensure => absent,
+  }
 
-    package { 'mysql-proxy':
-      ensure => absent,
-    }
+  file { '/etc/mysql-proxy':
+    ensure  => absent,
+    recurse => true,
+    force   => true,
+  }
 
-    file { '/etc/mysql-proxy':
-      ensure  => absent,
-      recurse => true,
-      force   => true,
-    }
+  file { '/etc/default/mysql-proxy':
+    ensure => absent,
+  }
 
-    file { '/etc/default/mysql-proxy':
-      ensure => absent,
-    }
+  package { 'simpleproxy':
+    ensure => latest,
+  }
 
-    package { 'simpleproxy':
-      ensure => latest,
-    }
+  group { 'simpleproxy':
+    ensure => present,
+    system => true,
+  }
 
+  user { 'simpleproxy':
+    ensure     => present,
+    system     => true,
+    comment    => 'Simple Proxy User',
+    home       => '/usr/share/doc/simpleproxy',
+    gid        => 'simpleproxy',
+    shell      => '/bin/bash',
+    membership => 'minimum',
+    require    => [
+      Group['simpleproxy'],
+      Package['simpleproxy'],
+    ],
+  }
 }
diff --git a/templates/simpleproxy-mysql.init.erb b/templates/simpleproxy-mysql.init.erb
index 043cc48..bd87fdc 100644
--- a/templates/simpleproxy-mysql.init.erb
+++ b/templates/simpleproxy-mysql.init.erb
@@ -18,7 +18,7 @@ NAME=simpleproxy-mysql
 DAEMON=/usr/bin/simpleproxy
 DAEMON_ARGS="-L<%= @db_port %> -R <%= @db_host %>:<%= @db_port %> -d"
 SCRIPTNAME=/etc/init.d/$NAME
-USER=logstash
+USER=simpleproxy
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0