diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_forward_files/oval/shared.xml b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_forward_files/oval/shared.xml
index 724b916cd0d..8dfc24a1b93 100644
--- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_forward_files/oval/shared.xml
+++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_forward_files/oval/shared.xml
@@ -6,19 +6,13 @@
     </criteria>
   </definition>
 
-  <unix:password_object id="object_accounts_users_home_forward_file_existance_objects" version="1">
-    <unix:username datatype="string" operation="pattern match">.*</unix:username>
-    <filter action="include">state_accounts_users_home_forward_file_existance_interactive_gids</filter>
-  </unix:password_object>
-
-  <unix:password_state id="state_accounts_users_home_forward_file_existance_interactive_gids" version="1">
-    <unix:user_id datatype="int" operation="greater than or equal">{{{ gid_min }}}</unix:user_id>
-  </unix:password_state>
+  {{%- set interactive_users_object = "object_" ~ rule_id ~ "_objects" -%}}
+  {{{ create_interactive_users_list_object(interactive_users_object) }}}
 
   <local_variable id="var_accounts_users_home_forward_file_existance_dirs" datatype="string" version="1"
                   comment="Variable including all home dirs from interactive users">
     <object_component item_field="home_dir"
-                      object_ref="object_accounts_users_home_forward_file_existance_objects"/>
+                      object_ref="{{{ interactive_users_object }}}"/>
   </local_variable>
 
   <unix:file_object id="object_accounts_users_home_forward_file_existance" version="1">
diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_forward_files/tests/interactive_user_nologin_ignored.pass.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_forward_files/tests/interactive_user_nologin_ignored.pass.sh
new file mode 100644
index 00000000000..f0b620139d4
--- /dev/null
+++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_forward_files/tests/interactive_user_nologin_ignored.pass.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# remediation = none
+
+USER="cac_user"
+useradd -m -s /sbin/nologin $USER
+touch /home/$USER/.forward