diff --git a/inventory/models/rooms.py b/inventory/models/rooms.py
index 0244a48..3360272 100644
--- a/inventory/models/rooms.py
+++ b/inventory/models/rooms.py
@@ -23,7 +23,6 @@ class Room(db.Model):
     inventory: Mapped[List['Inventory']] = relationship('Inventory', back_populates='location')
     users: Mapped[List['User']] = relationship('User', back_populates='location')
 
-    ui_label_attr = 'name'
     ui_eagerload = tuple()
     ui_extra_attrs = ('area_id', 'function_id')
 
diff --git a/inventory/static/js/dropdown.js b/inventory/static/js/dropdown.js
index bf204b2..682584c 100644
--- a/inventory/static/js/dropdown.js
+++ b/inventory/static/js/dropdown.js
@@ -97,6 +97,8 @@ function DropDown(cfg) {
         id: cfg.id,
         refreshUrl: cfg.refreshUrl,
         selectUrl: cfg.selectUrl,
+        recordId: cfg.recordId,   // NEW
+        field: cfg.field,         // NEW
 
         selectedId: null,
         selectedLabel: '',
@@ -125,19 +127,21 @@ function DropDown(cfg) {
             if (button) {
                 button.textContent = label || '-';
                 button.dataset.invValue = id;
-                button.classList.add("rounded-end-0");
-                button.classList.add("border-end-0");
+                button.classList.add("rounded-end-0", "border-end-0");
                 button.classList.remove("rounded-end");
             }
 
             clear?.classList.toggle('d-none', !id);
 
-            if (this.selectUrl) {
+            if (this.selectUrl && this.recordId && this.field) {
+                const payload = { id: this.recordId };
+                payload[this.field] = id ? parseInt(id) : null;
+
                 fetch(this.selectUrl, {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ id })
-                }).catch(() => {});
+                    body: JSON.stringify(payload)
+                }).catch(() => { });
             }
         },
 
@@ -153,12 +157,21 @@ function DropDown(cfg) {
             if (button) {
                 button.textContent = '-';
                 button.removeAttribute('data-inv-value');
-
-                button.classList.remove("rounded-end-0");
-                button.classList.remove("border-end-0");
+                button.classList.remove("rounded-end-0", "border-end-0");
                 button.classList.add("rounded-end");
             }
             clear?.classList.add('d-none');
+
+            if (this.selectUrl && this.recordId && this.field) {
+                const payload = { id: this.recordId };
+                payload[this.field] = null;
+                fetch(this.selectUrl, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(payload)
+                }).catch(() => { });
+            }
+
             this.$dispatch('dropdown:cleared', {});
         }
     };
diff --git a/inventory/templates/fragments/_dropdown_fragment.html b/inventory/templates/fragments/_dropdown_fragment.html
index 9ca3e68..30ebf76 100644
--- a/inventory/templates/fragments/_dropdown_fragment.html
+++ b/inventory/templates/fragments/_dropdown_fragment.html
@@ -42,8 +42,7 @@
 </div>
 {% endmacro %}
 
-
-{% macro dynamic_dropdown(id, list = none, label = none, current_item = none, entry_link = none, enabled = true, refresh_url = none, select_url = none) %}
+{% macro dynamic_dropdown(id, list = none, label = none, current_item = none, entry_link = none, enabled = true, refresh_url = none, select_url = none, record_id = none, field_name = none) %}
 <label for="{{ id }}" class="form-label">
     {{ label or '' }}
     {% if entry_link %}
@@ -53,7 +52,9 @@
 <div class="dropdown" id="{{ id }}-dropdown" x-data='DropDown({
         id: {{ id|tojson }},
         refreshUrl: {{ refresh_url|tojson if refresh_url else "null" }},
-        selectUrl: {{ select_url|tojson if select_url else "null" }}
+        selectUrl: {{ select_url|tojson if select_url else "null" }},
+        recordId: {{ record_id|tojson if record_id else "null"}},
+        field: {{ field_name|tojson if field_name else "null"}}
     })'
     hx-preserve x-init="init()">
     <div class="btn-group w-100">
diff --git a/inventory/templates/user.html b/inventory/templates/user.html
index 1f73575..be11b35 100644
--- a/inventory/templates/user.html
+++ b/inventory/templates/user.html
@@ -106,23 +106,29 @@
 
         <div class="row mt-2">
             <div class="col-6">
-                {{ dropdowns.render_dropdown(
+                {{ dropdowns.dynamic_dropdown(
                     id='supervisor',
-                    list=users,
                     label='Supervisor',
                     current_item=user.supervisor if user.supervisor else None,
                     entry_link='user',
-                    enabled=user.active
+                    enabled=user.active,
+                    refresh_url = url_for('ui.list_items', model_name='user'),
+                    select_url = url_for('ui.update_item', model_name='user'),
+                    record_id = user.id,
+                    field_name = 'supervisor_id'
                 ) }}
             </div>
 
             <div class="col-6">
-                {{ dropdowns.render_dropdown(
+                {{ dropdowns.dynamic_dropdown(
                     id='location',
-                    list=rooms,
                     label='Location',
                     current_item=user.location if user.location else None,
-                    enabled=user.active
+                    enabled=user.active,
+                    refresh_url = url_for('ui.list_items', model_name='room'),
+                    select_url = url_for('ui.update_item', model_name='user'),
+                    record_id = user.id,
+                    field_name = 'location_id'
                 ) }}
             </div>
         </div>
diff --git a/inventory/ui/defaults.py b/inventory/ui/defaults.py
index f87ced4..6661fd4 100644
--- a/inventory/ui/defaults.py
+++ b/inventory/ui/defaults.py
@@ -73,14 +73,48 @@ def default_create(session, Model, payload):
     session.commit()
     return obj
 
+# def default_update(session, Model, id_, payload):
+#     obj = session.get(Model, id_)
+#     if not obj:
+#         return None
+#     label = infer_label_attr(Model)
+#     if (nv := payload.get(label) or payload.get("name")):
+#         setattr(obj, label, nv)
+#     session.commit()
+#     return obj
+
 def default_update(session, Model, id_, payload):
     obj = session.get(Model, id_)
     if not obj:
         return None
-    label = infer_label_attr(Model)
-    if (nv := payload.get(label) or payload.get("name")):
-        setattr(obj, label, nv)
-    session.commit()
+
+    editable = getattr(Model, 'ui_editable_cols', None)
+
+    changed = False
+    for k, v in payload.items():
+        if k == 'id':
+            continue
+
+        col = _mapped_column(Model, k)
+        if col is None:
+            continue
+
+        if editable and k not in editable:
+            continue
+
+        if v == '' or v is None:
+            nv = None
+        else:
+            try:
+                nv = int(v) if col.type.python_type is int else v
+            except Exception:
+                nv = v
+
+        setattr(obj, k, nv)
+        changed = True
+
+    if changed:
+        session.commit()
     return obj
 
 def default_delete(session, Model, ids):