diff --git a/html/admin.html b/html/admin.html
index 78cc93d..83d1082 100644
--- a/html/admin.html
+++ b/html/admin.html
@@ -103,14 +103,18 @@
                         <input type="checkbox" id="modify-user-homescreen" checked>
                         <span>{{ .strings.applyHomescreenLayout }}</span>
                     </label>
-                    <label class="switch">
-                        <input type="checkbox" id="modify-user-ombi" checked>
-                        <span>{{ .strings.applyOmbi }}</span>
-                    </label>
-                    <label class="switch">
-                        <input type="checkbox" id="modify-user-jellyseerr" checked>
-                        <span>{{ .strings.applyJellyseerr }}</span>
-                    </label>
+                    {{ if .ombiEnabled }}
+                        <label class="switch">
+                            <input type="checkbox" id="modify-user-ombi" checked>
+                            <span>{{ .strings.applyOmbi }}</span>
+                        </label>
+                    {{ end }}
+                    {{ if .jellyseerrEnabled }}
+                        <label class="switch">
+                            <input type="checkbox" id="modify-user-jellyseerr" checked>
+                            <span>{{ .strings.applyJellyseerr }}</span>
+                        </label>
+                    {{ end }}
                     <label>
                         <input type="submit" class="unfocused">
                         <span class="button ~urge @low full-width center supra submit">{{ .strings.apply }}</span>
diff --git a/ts/modules/accounts.ts b/ts/modules/accounts.ts
index a677c3a..08c4ccd 100644
--- a/ts/modules/accounts.ts
+++ b/ts/modules/accounts.ts
@@ -891,8 +891,8 @@ export class accountsList extends PaginatedList {
 
     private _applyHomescreen = document.getElementById("modify-user-homescreen") as HTMLInputElement;
     private _applyConfiguration = document.getElementById("modify-user-configuration") as HTMLInputElement;
-    private _applyOmbi = document.getElementById("modify-user-ombi") as HTMLInputElement;
-    private _applyJellyseerr = document.getElementById("modify-user-jellyseerr") as HTMLInputElement;
+    private _applyOmbi = window.ombiEnabled ? document.getElementById("modify-user-ombi") as HTMLInputElement : null;
+    private _applyJellyseerr = window.jellyseerrEnabled ? document.getElementById("modify-user-jellyseerr") as HTMLInputElement : null;
 
     private _selectAll = document.getElementById("accounts-select-all") as HTMLInputElement;
     private _selectAllState: SelectAllState = SelectAllState.None;
@@ -1047,15 +1047,6 @@ export class accountsList extends PaginatedList {
         this._modifySettings.onclick = this.modifyUsers;
         this._modifySettings.classList.add("unfocused");
 
-        if (window.ombiEnabled)
-            this._applyOmbi.parentElement.classList.remove("unfocused");
-        else
-            this._applyOmbi.parentElement.classList.add("unfocused");
-        if (window.jellyseerrEnabled)
-            this._applyJellyseerr.parentElement.classList.remove("unfocused");
-        else
-            this._applyJellyseerr.parentElement.classList.add("unfocused");
-
         const checkSource = () => {
             const profileSpan = this._modifySettingsProfile.nextElementSibling as HTMLSpanElement;
             const userSpan = this._modifySettingsUser.nextElementSibling as HTMLSpanElement;
@@ -1066,8 +1057,8 @@ export class accountsList extends PaginatedList {
                 profileSpan.classList.remove("@low");
                 userSpan.classList.remove("@high");
                 userSpan.classList.add("@low");
-                this._applyOmbi.parentElement.classList.remove("unfocused");
-                this._applyJellyseerr.parentElement.classList.remove("unfocused");
+                this._applyOmbi?.parentElement.classList.remove("unfocused");
+                this._applyJellyseerr?.parentElement.classList.remove("unfocused");
             } else {
                 this._userSelect.parentElement.classList.remove("unfocused");
                 this._profileSelect.parentElement.classList.add("unfocused");
@@ -1075,8 +1066,8 @@ export class accountsList extends PaginatedList {
                 userSpan.classList.remove("@low");
                 profileSpan.classList.remove("@high");
                 profileSpan.classList.add("@low");
-                this._applyOmbi.parentElement.classList.add("unfocused");
-                this._applyJellyseerr.parentElement.classList.add("unfocused");
+                this._applyOmbi?.parentElement.classList.add("unfocused");
+                this._applyJellyseerr?.parentElement.classList.add("unfocused");
             }
         };
         this._modifySettingsProfile.onchange = checkSource;
@@ -1873,9 +1864,13 @@ export class accountsList extends PaginatedList {
                 "apply_to": list,
                 "homescreen": this._applyHomescreen.checked,
                 "configuration": this._applyConfiguration.checked,
-                "ombi": this._applyOmbi.checked,
-                "jellyseerr": this._applyJellyseerr.checked
             };
+            if (window.ombiEnabled) {
+                send["ombi"] = this._applyOmbi.checked;
+            }
+            if (window.jellyseerrEnabled) {
+                send["jellyseerr"] = this._applyJellyseerr.checked;
+            }
             if (this._modifySettingsProfile.checked && !this._modifySettingsUser.checked) { 
                 send["from"] = "profile";
                 send["profile"] = this._profileSelect.value;