diff --git a/models/users.js b/models/users.js
index 98dfe439f..1043eaa91 100644
--- a/models/users.js
+++ b/models/users.js
@@ -1302,42 +1302,46 @@ if (Meteor.isServer) {
     setUsersTeamsTeamDisplayName(teamId, teamDisplayName) {
       check(teamId, String);
       check(teamDisplayName, String);
-      Users.find({
-        teams: {
-            $elemMatch: {teamId: teamId} 
-        }
-      }).forEach(user => {
-        Users.update({ 
-          _id: user._id,
+      if (Meteor.user() && Meteor.user().isAdmin) {
+        Users.find({
           teams: {
-            $elemMatch: {teamId: teamId} 
-          }
-        }, {
-          $set: {
-            'teams.$.teamDisplayName': teamDisplayName
+              $elemMatch: {teamId: teamId} 
           }
+        }).forEach(user => {
+          Users.update({ 
+            _id: user._id,
+            teams: {
+              $elemMatch: {teamId: teamId} 
+            }
+          }, {
+            $set: {
+              'teams.$.teamDisplayName': teamDisplayName
+            }
+          });
         });
-      });
+      }
     },
     setUsersOrgsOrgDisplayName(orgId, orgDisplayName) {
       check(orgId, String);
       check(orgDisplayName, String);
-      Users.find({
-        orgs: {
-            $elemMatch: {orgId: orgId} 
-        }
-      }).forEach(user => {
-        Users.update({ 
-          _id: user._id,
+      if (Meteor.user() && Meteor.user().isAdmin) {
+        Users.find({
           orgs: {
-            $elemMatch: {orgId: orgId} 
-          }
-        }, {
-          $set: {
-            'orgs.$.orgDisplayName': orgDisplayName
+              $elemMatch: {orgId: orgId} 
           }
+        }).forEach(user => {
+          Users.update({ 
+            _id: user._id,
+            orgs: {
+              $elemMatch: {orgId: orgId} 
+            }
+          }, {
+            $set: {
+              'orgs.$.orgDisplayName': orgDisplayName
+            }
+          });
         });
-      });
+      }
     },
   });
   Accounts.onCreateUser((options, user) => {