diff --git a/src/plugins/AdminPlugin.cpp b/src/plugins/AdminPlugin.cpp
index f642308d..01e54fad 100644
--- a/src/plugins/AdminPlugin.cpp
+++ b/src/plugins/AdminPlugin.cpp
@@ -137,10 +137,15 @@ void AdminPlugin::handleSetOwner(const User &o)
         strcpy(owner.id, o.id);
     }
     if (owner.is_licensed != o.is_licensed) {
-        changed = true;
+        changed = 1;
         owner.is_licensed = o.is_licensed;
     }
 
+    if ((!changed || o.team) && (owner.team != o.team)) {
+        changed = 1;
+        owner.team = o.team;
+    }
+
     if (changed) // If nothing really changed, don't broadcast on the network or write to flash
         service.reloadOwner();
 }