diff --git a/packstack/puppet/templates/qpid_auth.pp b/packstack/puppet/templates/qpid_auth.pp
index 7c668240f..bbc831216 100644
--- a/packstack/puppet/templates/qpid_auth.pp
+++ b/packstack/puppet/templates/qpid_auth.pp
@@ -5,3 +5,11 @@ qpid_user { '%(CONFIG_QPID_AUTH_USER)s':
     provider => 'saslpasswd2',
     require   => Class['qpid::server'],
 }
+
+file { 'sasldb_file':
+    path => '/var/lib/qpidd/qpidd.sasldb',
+    ensure => file,
+    owner => 'qpidd',
+    group => 'qpidd',
+}
+
diff --git a/packstack/puppet/templates/qpid_ssl.pp b/packstack/puppet/templates/qpid_ssl.pp
index 21312ac26..cf5250966 100644
--- a/packstack/puppet/templates/qpid_ssl.pp
+++ b/packstack/puppet/templates/qpid_ssl.pp
@@ -6,14 +6,15 @@ group { 'qpidd':
 
 exec { 'stop_qpid' :
         command => '/sbin/service qpidd stop',
+        onlyif  => '/sbin/service qpidd status',
 }
 
 user { 'qpidd':
     ensure     => 'present',
     managehome => true,
     home       => '/var/run/qpidd',
-    require => Group['qpidd'],
-    before => Class['qpid::server']
+    gid        => 'qpidd',
+    before     => Class['qpid::server']
 }
 
 Exec['stop_qpid']->User['qpidd']