diff --git a/entity/MSTTeam_entity/recordcontainers/jdito/onUpdate.js b/entity/MSTTeam_entity/recordcontainers/jdito/onUpdate.js
index 07569b024b862d9ffeb5b09a33b7cd403dac7baf..f55e08ec25b6295855e3ea6df42578677893b2e4 100644
--- a/entity/MSTTeam_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/MSTTeam_entity/recordcontainers/jdito/onUpdate.js
@@ -29,14 +29,9 @@ insertedTeamMembers.forEach(function (teamMember){
         }
         return;
     }
-    var memberAzureId = memberUser[tools.PARAMS][tools.TEAMS_AZUREID];
-    var memberUpn = memberUser[tools.PARAMS][tools.TEAMS_AZUREUPN];
-    if (!memberAzureId && memberUpn)
-        memberAzureId = teams.getInternalAzureId(memberUpn);
-    if (memberAzureId)
-    {
-        internalMembers.push(teams.createInternalUserConfig(memberAzureId).setOwner(teamMember["ROLE"] == "owner"));
-    }
+    var internalUserConfigToAdd = _getTeamsInternalUserConfig(memberUser, teamMember["ROLE"] == "owner");
+    if (internalUserConfigToAdd)
+        internalMembers.push(internalUserConfigToAdd);
 });
 
 if (internalMembers.length !== 0)
@@ -47,8 +42,13 @@ if (externalMembers.length !== 0)
 
 changedTeamMembers.forEach(function (teamMember){
     var memberUser = EmployeeUtils.getUserByContactId(teamMember["CONTACT_ID"]);
+    if (!memberUser)
+        return null;
     
-    //teams.changeRole(teamId, );
+    var internalUserConfigToChange = _getTeamsInternalUserConfig(memberUser, teamMember["ROLE"] == "owner");
+    if (internalUserConfigToChange)
+        teams.changeRole(teamId, internalUserConfigToChange);
+    return null;//prevent designer warning
 });
 
 
@@ -60,4 +60,17 @@ var removeMembers = deletedTeamMembers.map(function (member)
 });
 
 if (removeMembers.length !== 0)
-    teams.removeInternalMembers(teamId, removeMembers);
\ No newline at end of file
+    teams.removeInternalMembers(teamId, removeMembers);
+
+function _getTeamsInternalUserConfig(pUserObject, pAsOwner)
+{
+    var memberAzureId = pUserObject[tools.PARAMS][tools.TEAMS_AZUREID];
+    var memberUpn = pUserObject[tools.PARAMS][tools.TEAMS_AZUREUPN];
+    if (!memberAzureId && memberUpn)
+        memberAzureId = teams.getInternalAzureId(memberUpn);
+    if (memberAzureId)
+    {
+        return teams.createInternalUserConfig(memberAzureId).setOwner(pAsOwner);
+    }
+    return null;
+}
\ No newline at end of file