diff --git a/rules/system_settings/system_settings_rae_disable.yaml b/rules/system_settings/system_settings_rae_disable.yaml
index 47c6696c..4f3cd444 100644
--- a/rules/system_settings/system_settings_rae_disable.yaml
+++ b/rules/system_settings/system_settings_rae_disable.yaml
@@ -14,7 +14,7 @@ fix: |
   /usr/sbin/systemsetup -setremoteappleevents off
   /bin/launchctl disable system/com.apple.AEServer
   ----
-  NOTE: Systemsetup with -setremoteappleevents flag will fail unless you grant Full Disk Access to systemsetup or it's parent process. Requires UAMDM.
+  NOTE: Systemsetup with -setremoteappleevents flag will fail unless you grant Full Disk Access to systemsetup or it's parent process. Requires supervision.
 references:
   cce:
     - CCE-91970-4
diff --git a/rules/system_settings/system_settings_ssh_disable.yaml b/rules/system_settings/system_settings_ssh_disable.yaml
index 884c353f..c244fe0a 100644
--- a/rules/system_settings/system_settings_ssh_disable.yaml
+++ b/rules/system_settings/system_settings_ssh_disable.yaml
@@ -11,8 +11,10 @@ result:
 fix: |
   [source,bash]
   ----
+  /usr/sbin/systemsetup -f -setremotelogin off
   /bin/launchctl disable system/com.openssh.sshd
   ----
+  NOTE: Systemsetup with -setremotelogin flag will fail unless you grant Full Disk Access to systemsetup or it's parent process. Requires supervision.
 references:
   cce:
     - CCE-91984-5