diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp
index 17a464b1a..7c3eeefe6 100644
--- a/manifests/profile/pacemaker/rabbitmq_bundle.pp
+++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp
@@ -118,6 +118,20 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
     replace => true,
     require => Class['::rabbitmq'],
   }
+  file_line { 'rabbitmq-pamd-systemd':
+    ensure            => absent,
+    path              => '/etc/pam.d/system-auth',
+    match             => '^-session\s+optional\s+pam_systemd.so',
+    match_for_absence => true,
+  }
+  # Note that once we move to RHEL8 where pam_unix.so supports the quiet option
+  # we can just add quiet to the pam_unix option for the session module and remove this one
+  file_line { 'rabbitmq-pamd-succeed':
+    ensure => present,
+    path   => '/etc/pam.d/system-auth',
+    line   => 'session     sufficient    pam_succeed_if.so quiet_success user ingroup rabbitmq',
+    after  => '^session.*pam_limits.so'
+  }
 
   if $step >= 1 and $pacemaker_master and hiera('stack_action') == 'UPDATE' {
     tripleo::pacemaker::resource_restart_flag { 'rabbitmq-clone':