diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_enabled/bash/shared.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_enabled/bash/shared.sh
index 492789c7a24..bd7ef67ddd7 100644
--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_enabled/bash/shared.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_enabled/bash/shared.sh
@@ -1,3 +1,3 @@
 # platform = multi_platform_ubuntu
 
-{{{ bash_pam_pwhistory_enable() }}}
+{{{ bash_pam_pwhistory_enable('cac_pwhistory','requisite') }}}
diff --git a/shared/macros/10-bash.jinja b/shared/macros/10-bash.jinja
index 86c8a17e072..08154f27535 100644
--- a/shared/macros/10-bash.jinja
+++ b/shared/macros/10-bash.jinja
@@ -983,7 +983,7 @@ if [ -f /usr/bin/authselect ]; then
     fi
 else
 {{% if 'ubuntu' in product %}}
-conf_name=cac_pwhistory
+conf_name={{{ pam_file }}}
 conf_path="/usr/share/pam-configs"
 
 if [ ! -f "$conf_path"/"$conf_name" ]; then
@@ -992,7 +992,7 @@ Name: pwhistory password history checking
 Default: yes
 Priority: 1024
 Password-Type: Primary
-Password: requisite pam_pwhistory.so remember=24 enforce_for_root try_first_pass use_authtok
+Password: {{{ control }}} pam_pwhistory.so remember=24 enforce_for_root try_first_pass use_authtok
 EOF
 fi