diff --git a/quickshell/Common/settings/Processes.qml b/quickshell/Common/settings/Processes.qml
index ca1a2a6e6..4af5a8f68 100644
--- a/quickshell/Common/settings/Processes.qml
+++ b/quickshell/Common/settings/Processes.qml
@@ -367,7 +367,7 @@ Singleton {
         ToastService.dismissCategory("greeter-autologin-sync");
         if (settingsRoot)
             settingsRoot.set("greeterSyncPending", true);
-        ToastService.showWarning(I18n.tr("Auto-login change needs a sync"), I18n.tr("Administrator access is required. Use the Sync button in Settings → Greeter to apply.") + (details ? "\n\n" + details : ""), "dms greeter sync --autologin", "greeter-autologin-sync");
+        ToastService.showWarning(I18n.tr("Auto-login change needs a sync"), I18n.tr("Administrator access is required. Use the Sync button in Settings → Greeter to apply.") + (details ? "\n\n" + details : ""), "dms-greeter sync --autologin", "greeter-autologin-sync");
         finishGreeterAutoLoginSync();
     }
 
@@ -535,7 +535,7 @@ Singleton {
     }
 
     property var greeterAutoLoginSyncProcess: Process {
-        command: ["dms", "greeter", "sync", "--yes", "--autologin"]
+        command: ["dms-greeter", "sync", "--yes", "--autologin"]
         running: false
 
         stdout: StdioCollector {
@@ -575,7 +575,7 @@ Singleton {
         onExited: exitCode => {
             const enabling = root.settingsRoot && root.settingsRoot.greeterAutoLogin;
             if (exitCode === 0) {
-                ToastService.showWarning(enabling ? I18n.tr("Applying auto-login on startup...") : I18n.tr("Disabling auto-login on startup..."), "", "dms greeter sync --autologin", "greeter-autologin-sync");
+                ToastService.showWarning(enabling ? I18n.tr("Applying auto-login on startup...") : I18n.tr("Disabling auto-login on startup..."), "", "dms-greeter sync --autologin", "greeter-autologin-sync");
                 root.greeterAutoLoginSyncProcess.running = true;
                 return;
             }
diff --git a/quickshell/Common/settings/SettingsSpec.js b/quickshell/Common/settings/SettingsSpec.js
index 2173a4645..1fbb21049 100644
--- a/quickshell/Common/settings/SettingsSpec.js
+++ b/quickshell/Common/settings/SettingsSpec.js
@@ -228,8 +228,8 @@ var SPEC = {
     greeterRememberLastSession: { def: true, onChange: "markGreeterSyncPending" },
     greeterRememberLastUser: { def: true, onChange: "markGreeterSyncPending" },
     greeterAutoLogin: { def: false, onChange: "scheduleGreeterAutoLoginSync" },
-    greeterEnableFprint: { def: false, onChange: "scheduleAuthApply" },
-    greeterEnableU2f: { def: false, onChange: "scheduleAuthApply" },
+    greeterEnableFprint: { def: false, onChange: "markGreeterSyncPending" },
+    greeterEnableU2f: { def: false, onChange: "markGreeterSyncPending" },
     greeterWallpaperPath: { def: "", onChange: "markGreeterSyncPending" },
     greeterLockDateFormat: { def: "", onChange: "markGreeterSyncPending" },
     greeterFontFamily: { def: "", onChange: "markGreeterSyncPending" },
diff --git a/quickshell/Modules/Settings/GreeterTab.qml b/quickshell/Modules/Settings/GreeterTab.qml
index 97d6a23e7..cf62bc4bd 100644
--- a/quickshell/Modules/Settings/GreeterTab.qml
+++ b/quickshell/Modules/Settings/GreeterTab.qml
@@ -25,7 +25,7 @@ Item {
 
         switch (SettingsData.greeterFingerprintReason) {
         case "ready":
-            return I18n.tr("Authentication changes apply automatically", "greeter auth setting description");
+            return I18n.tr("Applies on the next greeter sync", "greeter auth setting description");
         case "missing_enrollment":
             return I18n.tr("Fingerprint reader detected, but no prints are enrolled yet. You can enable this now and run Sync later.", "greeter fingerprint login setting");
         case "missing_reader":
@@ -45,7 +45,7 @@ Item {
 
         switch (SettingsData.greeterU2fReason) {
         case "ready":
-            return I18n.tr("Authentication changes apply automatically", "greeter auth setting description");
+            return I18n.tr("Applies on the next greeter sync", "greeter auth setting description");
         case "missing_key_registration":
             return I18n.tr("Security-key support was detected, but no registered key was found yet. You can enable this now and register one later.", "security key setting status");
         case "missing_pam_support":
@@ -116,7 +116,7 @@ Item {
         case "install":
             return ["dms", "greeter", "install", "--terminal"];
         case "activate":
-            return ["dms", "greeter", "enable", "--terminal"];
+            return ["dms-greeter", "enable", "--terminal"];
         default:
             return [];
         }
@@ -217,7 +217,7 @@ Item {
 
     Process {
         id: greeterStatusProcess
-        command: ["dms", "greeter", "status"]
+        command: ["dms-greeter", "status"]
         running: false
 
         stdout: StdioCollector {
@@ -240,7 +240,7 @@ Item {
                     root.greeterStatusText = root.greeterStatusText + "\n\nstderr:\n" + err;
                 return;
             }
-            var failure = I18n.tr("Failed to run 'dms greeter status'. Ensure DMS is installed and dms is in PATH.", "greeter status error") + " (exit " + exitCode + ")";
+            var failure = I18n.tr("Failed to run 'dms-greeter status'. Ensure the dms-greeter package is installed.", "greeter status error") + " (exit " + exitCode + ")";
             if (out !== "")
                 failure = failure + "\n\n" + out;
             if (err !== "")
@@ -251,7 +251,7 @@ Item {
 
     Process {
         id: greeterSyncProcess
-        command: ["dms", "greeter", "sync", "--yes"]
+        command: ["dms-greeter", "sync", "--yes"]
         running: false
 
         stdout: StdioCollector {
@@ -314,7 +314,7 @@ Item {
 
     Process {
         id: greeterTerminalFallbackProcess
-        command: ["dms", "greeter", "sync", "--terminal", "--yes"]
+        command: ["dms-greeter", "sync", "--terminal", "--yes"]
         running: false
 
         stderr: StdioCollector {
@@ -329,7 +329,7 @@ Item {
                 SettingsData.clearGreeterSyncPending();
                 return;
             }
-            var fallback = I18n.tr("Terminal fallback failed. Install one of the supported terminal emulators or run 'dms greeter sync' manually.") + " (exit " + exitCode + ")";
+            var fallback = I18n.tr("Terminal fallback failed. Install one of the supported terminal emulators or run 'dms-greeter sync' manually.") + " (exit " + exitCode + ")";
             const err = (root.greeterTerminalFallbackStderr || "").trim();
             if (err !== "")
                 fallback = fallback + "\n\nstderr:\n" + err;
@@ -421,7 +421,7 @@ Item {
                 settingKey: "greeterStatus"
 
                 StyledText {
-                    text: I18n.tr("Sync applies your theme and settings to the login screen. Shared users should run dms greeter sync --profile instead of a primary user sync.")
+                    text: I18n.tr("Sync applies your theme and settings to the login screen. Shared users should run dms-greeter sync --profile instead of a primary user sync.")
                     font.pixelSize: Theme.fontSizeSmall
                     color: Theme.surfaceVariantText
                     width: parent.width
diff --git a/quickshell/Modules/Settings/UsersTab.qml b/quickshell/Modules/Settings/UsersTab.qml
index bf76cb1c2..19e409aaf 100644
--- a/quickshell/Modules/Settings/UsersTab.qml
+++ b/quickshell/Modules/Settings/UsersTab.qml
@@ -148,7 +148,7 @@ Item {
 
                 StyledText {
                     width: parent.width
-                    text: I18n.tr("Greeter group members can sync their login-screen theme with dms greeter sync --profile after logging out and back in.")
+                    text: I18n.tr("Greeter group members can sync their login-screen theme with dms-greeter sync --profile after logging out and back in.")
                     font.pixelSize: Theme.fontSizeSmall
                     color: Theme.surfaceVariantText
                     wrapMode: Text.Wrap
@@ -263,7 +263,7 @@ Item {
                                         const enableGreeter = !userRow.modelData.isGreeter;
                                         greeterToggleConfirm.showWithOptions({
                                             title: enableGreeter ? I18n.tr("Allow greeter access?") : I18n.tr("Remove greeter access?"),
-                                            message: enableGreeter ? I18n.tr("Add \"%1\" to the %2 group? They must log out and back in, then run dms greeter sync --profile to publish their login-screen theme.").arg(userRow.modelData.username).arg(UsersService.greeterGroup) : I18n.tr("Remove \"%1\" from the %2 group?").arg(userRow.modelData.username).arg(UsersService.greeterGroup),
+                                            message: enableGreeter ? I18n.tr("Add \"%1\" to the %2 group? They must log out and back in, then run dms-greeter sync --profile to publish their login-screen theme.").arg(userRow.modelData.username).arg(UsersService.greeterGroup) : I18n.tr("Remove \"%1\" from the %2 group?").arg(userRow.modelData.username).arg(UsersService.greeterGroup),
                                             confirmText: enableGreeter ? I18n.tr("Allow") : I18n.tr("Remove"),
                                             confirmColor: Theme.primary,
                                             onConfirm: () => {
@@ -464,7 +464,7 @@ Item {
                     settingKey: "createUserGreeter"
                     tags: ["user", "greeter", "login", "sync"]
                     text: I18n.tr("Allow greeter login access")
-                    description: I18n.tr("Add the new user to the %1 group so they can run dms greeter sync --profile.").arg(UsersService.greeterGroup)
+                    description: I18n.tr("Add the new user to the %1 group so they can run dms-greeter sync --profile.").arg(UsersService.greeterGroup)
                     checked: root.pendingGreeter
                     onToggled: checked => root.pendingGreeter = checked
                 }