diff --git a/include/tests_boot_services b/include/tests_boot_services
index 264a0d86..4eb216d8 100644
--- a/include/tests_boot_services
+++ b/include/tests_boot_services
@@ -703,7 +703,7 @@
          if [ -f /usr/lib/systemd/system/rescue.service ]; then
              logtext "Result: file /usr/lib/systemd/system/rescue.service"
              logtext "Test: checking presence sulogin for single user mode"
-             FIND=`grep "^ExecStart=-/sbin/sulogin" /usr/lib/systemd/system/rescue.service`
+             FIND=`egrep "^ExecStart=-(/usr)?/sbin/sulogin" /usr/lib/systemd/system/rescue.service`
              if [ ! "${FIND}" = "" ]; then
                  FOUND=1
                  logtext "Result: found sulogin, so single user is protected"
@@ -712,7 +712,7 @@
                  logtext "Result: did not find sulogin in rescue.service"
                  AddHP 1 3
                  Display --indent 2 --text "- Checking sulogin in rescue.service" --result "NOT FOUND" --color YELLOW
-                 ReportSuggestion "Protect rescue.service by using sulogin"
+                 ReportSuggestion "${TEST_NO}" "Protect rescue.service by using sulogin"
              fi
            else
              logtext "Result: file /usr/lib/systemd/system/rescue.service does not exist"