diff --git a/lnbits/extensions/admin/models.py b/lnbits/extensions/admin/models.py
index 13a6cd233..45cd990d4 100644
--- a/lnbits/extensions/admin/models.py
+++ b/lnbits/extensions/admin/models.py
@@ -4,10 +4,10 @@ from pydantic import BaseModel
 
 class UpdateSettings(BaseModel):
     lnbits_backend_wallet_class: str = Query(None)
-    lnbits_admin_users: str = Query(None)
-    lnbits_allowed_users: str = Query(None)
-    lnbits_admin_ext: str = Query(None)
-    lnbits_disabled_ext: str = Query(None)
+    lnbits_admin_users: str = Query(None) #this should be List[str] ??
+    lnbits_allowed_users: str = Query(None) #this should be List[str] ??
+    lnbits_admin_ext: str = Query(None) #this should be List[str] ??
+    lnbits_disabled_ext: str = Query(None) #this should be List[str] ??
     lnbits_funding_source: str = Query(None)
     lnbits_force_https: bool = Query(None)
     lnbits_reserve_fee_min: int = Query(None, ge=0)
@@ -21,4 +21,4 @@ class UpdateSettings(BaseModel):
     lnbits_denomination: str = Query(None)
     lnbits_theme: str = Query(None)
     lnbits_custom_logo: str = Query(None)
-    lnbits_ad_space: str = Query(None)
+    lnbits_ad_space: str = Query(None) #this should be List[str] ??
diff --git a/lnbits/extensions/admin/templates/admin/_tab_users.html b/lnbits/extensions/admin/templates/admin/_tab_users.html
index c396ba7d6..08b08a628 100644
--- a/lnbits/extensions/admin/templates/admin/_tab_users.html
+++ b/lnbits/extensions/admin/templates/admin/_tab_users.html
@@ -71,6 +71,7 @@
           multiple
           hint="Extensions only user with admin privileges can use"
           label="Admin extensions"
+          :options="g.extensions.map(e => e.name)"
         ></q-select>
         <br />
       </div>
@@ -79,6 +80,7 @@
         <q-select
           filled
           v-model="formData.lnbits_disabled_extensions"
+          :options="g.extensions.map(e => e.name)"
           multiple
           hint="Disable extensions *amilk disabled by default as resource heavy"
           label="Disable extensions"
diff --git a/lnbits/extensions/admin/templates/admin/index.html b/lnbits/extensions/admin/templates/admin/index.html
index 18df16a97..4754656d7 100644
--- a/lnbits/extensions/admin/templates/admin/index.html
+++ b/lnbits/extensions/admin/templates/admin/index.html
@@ -3,7 +3,7 @@
 <div class="row q-col-gutter-md justify-center">
   <div class="col q-gutter-y-md q-my-md">
     <q-btn label="Save" color="primary" @click="updateSettings">
-      <!-- <q-badge color="red" rounded floating style="padding: 6px; border-radius: 6px"/> -->
+      <q-badge v-if="settingsChanged" color="red" rounded floating style="padding: 6px; border-radius: 6px"/>
     </q-btn>
     <q-btn
       label="Restart server"
@@ -109,13 +109,13 @@
       return {
         settings: {},
         formData: {},
-        //data: {},
         wallet: {},
         cancel: {},
         topUpDialog: {
           show: false
         },
-        tab: 'funding'
+        tab: 'funding',
+        settingsChanged: false
       }
     },
     created: function () {
@@ -125,8 +125,14 @@
       //this.formData.lnbits_ad_space = "hdh"
       console.log(this.formData)
       console.log(_.isEqual(this.settings, this.formData))
+      console.log(this.g.extensions)
 
     },
+    watch: {
+      settingsChanged(e){
+        return _.isEqual(this.settings, this.formData)
+      }
+    },
     methods: {
       addAdminUser() {
         let addUser = this.formData.admin_users_add