diff --git a/packages/rocketchat-authorization/server/methods/addUserToRole.js b/packages/rocketchat-authorization/server/methods/addUserToRole.js
index 21e7ddfdaad7..129f6b211b3e 100644
--- a/packages/rocketchat-authorization/server/methods/addUserToRole.js
+++ b/packages/rocketchat-authorization/server/methods/addUserToRole.js
@@ -15,7 +15,7 @@ Meteor.methods({
 			});
 		}
 
-		if (roleName === 'admin' && !RocketChat.authz.hasPermission(Meteor.userId(), 'assign-admin-role')) {
+		if (roleName === 'admin' && !RocketChat.authz.hasRole(Meteor.userId(), 'admin')) {
 			throw new Meteor.Error('error-action-not-allowed', 'Assigning admin is not allowed', {
 				method: 'authorization:addUserToRole',
 				action: 'Assign_admin'
diff --git a/packages/rocketchat-authorization/server/startup.js b/packages/rocketchat-authorization/server/startup.js
index 622738286edd..243da8cb296f 100644
--- a/packages/rocketchat-authorization/server/startup.js
+++ b/packages/rocketchat-authorization/server/startup.js
@@ -16,7 +16,6 @@ Meteor.startup(function() {
 		{ _id: 'add-user-to-any-c-room',        roles : ['admin'] },
 		{ _id: 'add-user-to-any-p-room',        roles : [] },
 		{ _id: 'archive-room',                  roles : ['admin', 'owner'] },
-		{ _id: 'assign-admin-role',             roles : ['admin'] },
 		{ _id: 'ban-user',                      roles : ['admin', 'owner', 'moderator'] },
 		{ _id: 'bulk-create-c',                 roles : ['admin'] },
 		{ _id: 'bulk-register-user',            roles : ['admin'] },
diff --git a/packages/rocketchat-i18n/i18n/af.i18n.json b/packages/rocketchat-i18n/i18n/af.i18n.json
index 3576e2b846ee..ee10cde71208 100644
--- a/packages/rocketchat-i18n/i18n/af.i18n.json
+++ b/packages/rocketchat-i18n/i18n/af.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Is jy seker?",
   "Are_you_sure_you_want_to_delete_your_account": "Is jy seker jy wil jou rekening uitvee?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Is jy seker jy wil Facebook integrasie uitskakel?",
-  "assign-admin-role": "Toeken Admin-rol",
-  "assign-admin-role_description": "Toestemming om die administrasierol aan ander gebruikers toe te ken",
   "Assign_admin": "Toekenning van administrasie",
   "at": "by",
   "At_least_one_added_token_is_required_by_the_user": "Ten minste een bykomende teken word deur die gebruiker vereis",
diff --git a/packages/rocketchat-i18n/i18n/ar.i18n.json b/packages/rocketchat-i18n/i18n/ar.i18n.json
index f951d6a39ee0..3b11e779e7db 100644
--- a/packages/rocketchat-i18n/i18n/ar.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ar.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "هل أنت متأكد؟",
   "Are_you_sure_you_want_to_delete_your_account": "هل أنت متأكد من أنك تريد حذف حسابك؟",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "هل تريد بالتأكيد تعطيل دمج فاسيبوك؟",
-  "assign-admin-role": "تعيين دور المدير",
-  "assign-admin-role_description": "التصريح بمنح المستخدمين الآخرين دور المدير",
   "Assign_admin": "تعيين المدير",
   "at": "في",
   "At_least_one_added_token_is_required_by_the_user": "مطلوب المستخدم رمز مميز واحد على الأقل",
diff --git a/packages/rocketchat-i18n/i18n/az.i18n.json b/packages/rocketchat-i18n/i18n/az.i18n.json
index 2b568e0713dd..683038659ece 100644
--- a/packages/rocketchat-i18n/i18n/az.i18n.json
+++ b/packages/rocketchat-i18n/i18n/az.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Sən əminsən?",
   "Are_you_sure_you_want_to_delete_your_account": "Hesabınızı silmək istədiyinizə əminsinizmi?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Facebook inteqrasiyasını əlindən almaq istəyirsiniz?",
-  "assign-admin-role": "Yönetici rolunu təyin edin",
-  "assign-admin-role_description": "Administrator rolunu digər istifadəçilərə təyin etmək üçün icazə",
   "Assign_admin": "Administrator təyin edilməsi",
   "at": "at",
   "At_least_one_added_token_is_required_by_the_user": "Istifadəçi tərəfindən ən az bir əlavə simvolu tələb olunur",
diff --git a/packages/rocketchat-i18n/i18n/bg.i18n.json b/packages/rocketchat-i18n/i18n/bg.i18n.json
index 4154d749d46a..145171822fa1 100644
--- a/packages/rocketchat-i18n/i18n/bg.i18n.json
+++ b/packages/rocketchat-i18n/i18n/bg.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Сигурен ли си?",
   "Are_you_sure_you_want_to_delete_your_account": "Наистина ли искате да изтриете профила си?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Наистина ли искате да деактивирате интеграцията във Facebook?",
-  "assign-admin-role": "Присвояване на ролята на администратор",
-  "assign-admin-role_description": "Разрешение за задаване на администраторската роля на други потребители",
   "Assign_admin": "Присвояване на администратор",
   "at": "при",
   "At_least_one_added_token_is_required_by_the_user": "Най-малко един допълнителен знак се изисква от потребителя",
diff --git a/packages/rocketchat-i18n/i18n/ca.i18n.json b/packages/rocketchat-i18n/i18n/ca.i18n.json
index d6b011773f96..dc6b1d19646f 100644
--- a/packages/rocketchat-i18n/i18n/ca.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ca.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "N'estàs segur?",
   "Are_you_sure_you_want_to_delete_your_account": "Estàs segur d'eliminar el teu compte?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Estàs segur que vols desactivar la integració de Facebook?",
-  "assign-admin-role": "Assignar rol d'administrador",
-  "assign-admin-role_description": "Permís per assignar el rol d'administrador a altres usuaris",
   "Assign_admin": "Assignant admin",
   "at": "a",
   "At_least_one_added_token_is_required_by_the_user": "Almenys un usuari afegeix un token afegit",
diff --git a/packages/rocketchat-i18n/i18n/cs.i18n.json b/packages/rocketchat-i18n/i18n/cs.i18n.json
index 6dddb6a6144b..a4e209b4ac0a 100644
--- a/packages/rocketchat-i18n/i18n/cs.i18n.json
+++ b/packages/rocketchat-i18n/i18n/cs.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Jste si jisti?",
   "Are_you_sure_you_want_to_delete_your_account": "Jste si jisti, že chcete smazat svůj účet?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Opravdu chcete zakázat Facebook integraci?",
-  "assign-admin-role": "Přiřadit roli administrátora",
-  "assign-admin-role_description": "Právo přiřadit roli administrátora dalším uživatelům",
   "Assign_admin": "Přiřadit administrátora",
   "at": "v",
   "At_least_one_added_token_is_required_by_the_user": "Uživatel musí mít přidán alespoň jeden token",
diff --git a/packages/rocketchat-i18n/i18n/da.i18n.json b/packages/rocketchat-i18n/i18n/da.i18n.json
index 99a1692f1518..74b7f24785cb 100644
--- a/packages/rocketchat-i18n/i18n/da.i18n.json
+++ b/packages/rocketchat-i18n/i18n/da.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Er du sikker?",
   "Are_you_sure_you_want_to_delete_your_account": "Er du sikker på, at du vil slette din konto?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Er du sikker på at du vil deaktivere Facebook integration?",
-  "assign-admin-role": "Tildel Admin-rolle",
-  "assign-admin-role_description": "Tilladelse til at tildele administratorrollen til andre brugere",
   "Assign_admin": "Tildele admin",
   "at": "på",
   "At_least_one_added_token_is_required_by_the_user": "Mindst en tilsat token kræves af brugeren",
diff --git a/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
index e61548195168..db2618fa8c00 100644
--- a/packages/rocketchat-i18n/i18n/de-AT.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Raum verstecken",
   "Are_you_sure_you_want_to_delete_your_account": "Sind Sie sicher, dass Sie Ihr Konto löschen möchten?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Möchten Sie die Facebook-Integration wirklich deaktivieren?",
-  "assign-admin-role": "Administratorrolle zuweisen",
-  "assign-admin-role_description": "Berechtigung, die Administratorrolle anderen Benutzern zuzuweisen",
   "Assign_admin": "Administrator zuweisen",
   "at": "am",
   "At_least_one_added_token_is_required_by_the_user": "Mindestens ein hinzugefügtes Token wird vom Benutzer benötigt",
diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index d084e966f366..58b77b2cb970 100755
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure_you_want_to_delete_your_account": "Bist Du sicher, dass Du Dein Konto löschen möchtest?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Bist Du dir sicher das Du die Facebook Integration deaktivieren möchtest?",
   "Assign_admin": "Admin zuweisen",
-  "assign-admin-role_description": "Berechtigung, Administratorrolle zuzuordnen",
-  "assign-admin-role": "Administratorrolle zuordnen",
   "At_least_one_added_token_is_required_by_the_user": "Mindestens eines der hinzugefügten Tokens wird vom Benutzer verlangt werden",
   "at": "am",
   "AtlassianCrowd": "Atlassian Crowd",
diff --git a/packages/rocketchat-i18n/i18n/el.i18n.json b/packages/rocketchat-i18n/i18n/el.i18n.json
index c13c88a9ef87..6554b2527b28 100644
--- a/packages/rocketchat-i18n/i18n/el.i18n.json
+++ b/packages/rocketchat-i18n/i18n/el.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Είστε σίγουρος?",
   "Are_you_sure_you_want_to_delete_your_account": "Είστε σίγουροι ότι θέλετε να διαγράψετε τον λογαριασμό σας;",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Είστε σίγουροι ότι θέλετε να απενεργοποιήσετε την ενσωμάτωση του Facebook;",
-  "assign-admin-role": "Ανάθεση Ρόλου Διαχειριστή",
-  "assign-admin-role_description": "Άδεια για ανάθεση ρόλου διαχειριστή σε άλλους χρήστες",
   "Assign_admin": "Ανάθεση διαχειριστή",
   "at": "στο",
   "At_least_one_added_token_is_required_by_the_user": "Τουλάχιστον ένα πρόσθετο διακριτικό απαιτείται από το χρήστη",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 5c6ccb9db509..15d2a855b705 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -266,8 +266,6 @@
   "Are_you_sure": "Are you sure?",
   "Are_you_sure_you_want_to_delete_your_account": "Are you sure you want to delete your account?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Are you sure you want to disable Facebook integration?",
-  "assign-admin-role": "Assign Admin Role",
-  "assign-admin-role_description": "Permission to assign the admin role to other users",
   "Assign_admin": "Assigning admin",
   "at": "at",
   "At_least_one_added_token_is_required_by_the_user": "At least one added token is required by the user",
diff --git a/packages/rocketchat-i18n/i18n/eo.i18n.json b/packages/rocketchat-i18n/i18n/eo.i18n.json
index 716e870b82ca..c4ff3ce5a2ed 100644
--- a/packages/rocketchat-i18n/i18n/eo.i18n.json
+++ b/packages/rocketchat-i18n/i18n/eo.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Ĉu vi certas?",
   "Are_you_sure_you_want_to_delete_your_account": "Ĉu vi certas, ke vi volas forigi vian konton?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Ĉu vi certas, ke vi volas malŝalti Facebook-integriĝon?",
-  "assign-admin-role": "Asigni Admin Rolo",
-  "assign-admin-role_description": "Permeso atribui la administran rolon al aliaj uzantoj",
   "Assign_admin": "Asignante administranton",
   "at": "ĉe",
   "At_least_one_added_token_is_required_by_the_user": "Almenaŭ unu aldonita token estas postulita de la uzanto",
diff --git a/packages/rocketchat-i18n/i18n/es.i18n.json b/packages/rocketchat-i18n/i18n/es.i18n.json
index a5007bc917a4..5a5ea5d41ced 100644
--- a/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Estás seguro?",
   "Are_you_sure_you_want_to_delete_your_account": "¿Estás seguro de que quieres eliminar tu cuenta?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "¿Está seguro que desea desabilitar la integración con Facebook?",
-  "assign-admin-role": "Asignar Rol de Administrador",
-  "assign-admin-role_description": "Permiso para asignar el rol admin a otros usuarios",
   "Assign_admin": "Asignando administrador",
   "at": "en",
   "At_least_one_added_token_is_required_by_the_user": "Al menos uno de los tokens agregados es requerido por el usuario",
diff --git a/packages/rocketchat-i18n/i18n/fa.i18n.json b/packages/rocketchat-i18n/i18n/fa.i18n.json
index ae8612ea6515..6bb3a19c5401 100644
--- a/packages/rocketchat-i18n/i18n/fa.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fa.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "آیا مطمئن هستید؟",
   "Are_you_sure_you_want_to_delete_your_account": "آیا شما مطمئن هستید که می خواهید حساب کاربری خود را حذف کنید؟",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "آیا مطمئن هستید که می خواهید یکپارچگی فیس بوک را غیرفعال کنید؟",
-  "assign-admin-role": "اعطای نقش مدیریت",
-  "assign-admin-role_description": "مجوز اختصاص دادن نقش مدیر به کاربران دیگر",
   "Assign_admin": "اختصاص دادن مدیر",
   "at": "در",
   "At_least_one_added_token_is_required_by_the_user": "حداقل یک نشانه اضافه شده توسط کاربر مورد نیاز است",
diff --git a/packages/rocketchat-i18n/i18n/fi.i18n.json b/packages/rocketchat-i18n/i18n/fi.i18n.json
index 31ae2db191bf..c603b15e220e 100644
--- a/packages/rocketchat-i18n/i18n/fi.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fi.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Oletko varma?",
   "Are_you_sure_you_want_to_delete_your_account": "Oletko varma, että haluat poistaa tilisi?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Oletko varma, että haluat poistaa Facebook-integraation käytöstä?",
-  "assign-admin-role": "Määritä admin-rooli",
-  "assign-admin-role_description": "Järjestelmänvalvojan rooli muille käyttäjille",
   "Assign_admin": "Järjestelmänvalvojan nimeäminen",
   "at": "-",
   "At_least_one_added_token_is_required_by_the_user": "Käyttäjä tarvitsee vähintään yhden lisäosan",
diff --git a/packages/rocketchat-i18n/i18n/fr.i18n.json b/packages/rocketchat-i18n/i18n/fr.i18n.json
index 877bc322abf3..b799ce0672fa 100644
--- a/packages/rocketchat-i18n/i18n/fr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fr.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Êtes-vous sûr(e) ?",
   "Are_you_sure_you_want_to_delete_your_account": "Êtes-vous sûr(e) de vouloir supprimer votre compte ?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Êtes-vous sûr de vouloir désactiver l'intégration de Facebook?",
-  "assign-admin-role": "Donner le rôle d'administrateur",
-  "assign-admin-role_description": "Permission de donner le rôle d'administrateur aux autres utilisateurs",
   "Assign_admin": "Attribution d'un administrateur",
   "at": "à",
   "At_least_one_added_token_is_required_by_the_user": "Au moins un jeton ajouté est requis par l'utilisateur",
diff --git a/packages/rocketchat-i18n/i18n/hr.i18n.json b/packages/rocketchat-i18n/i18n/hr.i18n.json
index bcdfa8cfde5b..46ee7d60a5ad 100644
--- a/packages/rocketchat-i18n/i18n/hr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/hr.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Jesi li siguran?",
   "Are_you_sure_you_want_to_delete_your_account": "Sigurni ste da želite izbrisati svoj račun?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Jeste li sigurni da želite onemogućiti Facebook integraciju?",
-  "assign-admin-role": "Dodijelite administratorsku ulogu",
-  "assign-admin-role_description": "Dopuštenje za dodjelu administratorske uloge drugim korisnicima",
   "Assign_admin": "Dodijeli administratora",
   "at": "na",
   "At_least_one_added_token_is_required_by_the_user": "Korisnik traži najmanje jedan dodani token",
diff --git a/packages/rocketchat-i18n/i18n/hu.i18n.json b/packages/rocketchat-i18n/i18n/hu.i18n.json
index 269cbb4574f2..f615e3e839be 100644
--- a/packages/rocketchat-i18n/i18n/hu.i18n.json
+++ b/packages/rocketchat-i18n/i18n/hu.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Biztos vagy benne?",
   "Are_you_sure_you_want_to_delete_your_account": "Biztos, hogy törli a fiókot?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Biztosan letiltja a Facebook integrációt?",
-  "assign-admin-role": "Adminisztrátori szerep hozzárendelése",
-  "assign-admin-role_description": "Engedély az adminisztrátor szerepének a többi felhasználóhoz való hozzárendeléséhez",
   "Assign_admin": "Adminisztrátor hozzárendelése",
   "at": "nál nél",
   "At_least_one_added_token_is_required_by_the_user": "A felhasználónak legalább egy hozzáadott tokenet kell megadnia",
diff --git a/packages/rocketchat-i18n/i18n/id.i18n.json b/packages/rocketchat-i18n/i18n/id.i18n.json
index 4492ab672050..9e568c2c5a8b 100644
--- a/packages/rocketchat-i18n/i18n/id.i18n.json
+++ b/packages/rocketchat-i18n/i18n/id.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Apakah anda yakin?",
   "Are_you_sure_you_want_to_delete_your_account": "Apakah Anda yakin ingin menghapus akun Anda?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Apakah Anda yakin ingin menonaktifkan integrasi Facebook?",
-  "assign-admin-role": "Tetapkan Peran Admin",
-  "assign-admin-role_description": "Izin untuk menetapkan peran admin ke pengguna lain",
   "Assign_admin": "Menugaskan admin",
   "at": "di",
   "At_least_one_added_token_is_required_by_the_user": "Setidaknya satu token tambahan dibutuhkan oleh pengguna",
diff --git a/packages/rocketchat-i18n/i18n/it.i18n.json b/packages/rocketchat-i18n/i18n/it.i18n.json
index 59ff24571e1e..674d577a8826 100644
--- a/packages/rocketchat-i18n/i18n/it.i18n.json
+++ b/packages/rocketchat-i18n/i18n/it.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Sei sicuro?",
   "Are_you_sure_you_want_to_delete_your_account": "Sei sicuro di voler cancellare il tuo account?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Sei sicuro di voler disabilitare l'integrazione di Facebook?",
-  "assign-admin-role": "Assegna ruolo amministrativo",
-  "assign-admin-role_description": "Autorizzazione ad assegnare il ruolo di amministratore ad altri utenti",
   "Assign_admin": "Assegna amministratore",
   "at": "a",
   "At_least_one_added_token_is_required_by_the_user": "Almeno un token aggiunto è richiesto dall'utente",
diff --git a/packages/rocketchat-i18n/i18n/ja.i18n.json b/packages/rocketchat-i18n/i18n/ja.i18n.json
index 37da6ace29f1..2e4ba3b276d6 100644
--- a/packages/rocketchat-i18n/i18n/ja.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ja.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "本当にいいですか?",
   "Are_you_sure_you_want_to_delete_your_account": "本当にアカウントを削除しますか?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Facebookの統合を無効にしてもよろしいですか？",
-  "assign-admin-role": "管理者ロールを割り当てる",
-  "assign-admin-role_description": "他のユーザーに管理者ロールを割り当てる権限",
   "Assign_admin": "管理者を割り当てる",
   "at": "at",
   "At_least_one_added_token_is_required_by_the_user": "少なくとも1つの追加されたトークンがユーザーに必要です",
diff --git a/packages/rocketchat-i18n/i18n/km.i18n.json b/packages/rocketchat-i18n/i18n/km.i18n.json
index b60693733eab..a908bd35b40d 100644
--- a/packages/rocketchat-i18n/i18n/km.i18n.json
+++ b/packages/rocketchat-i18n/i18n/km.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "តើ​អ្នក​ច្បាស់​ហើយ​ឬ?",
   "Are_you_sure_you_want_to_delete_your_account": "តើអ្នកពិតជាចង់លុបគណនីរបស់អ្នក?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "តើអ្នកប្រាកដថាអ្នកចង់បិទការរួមបញ្ចូលហ្វេសប៊ុកមែនទេ?",
-  "assign-admin-role": "ផ្ដល់តួនាទីគ្រប់គ្រង",
-  "assign-admin-role_description": "សិទ្ធិដើម្បីកំណត់តួនាទីគ្រប់គ្រងទៅអ្នកប្រើផ្សេងទៀត",
   "Assign_admin": "ចាត់ឱ្យអ្នកគ្រប់គ្រង",
   "at": "នៅ",
   "At_least_one_added_token_is_required_by_the_user": "យ៉ាងហោចណាស់តួលេខបន្ថែមត្រូវបានតម្រូវដោយអ្នកប្រើ",
diff --git a/packages/rocketchat-i18n/i18n/ko.i18n.json b/packages/rocketchat-i18n/i18n/ko.i18n.json
index 4e9b1c32247f..329919192c74 100644
--- a/packages/rocketchat-i18n/i18n/ko.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ko.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "확실 합니까?",
   "Are_you_sure_you_want_to_delete_your_account": "당신은 당신의 계정을 삭제 하시겠습니까?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Facebook 통합을 사용 중지 하시겠습니까?",
-  "assign-admin-role": "관리자 역할 할당",
-  "assign-admin-role_description": "다른 사용자에게 관리 역할을 할당 할 수있는 권한",
   "Assign_admin": "관리자 지정",
   "at": "...에서",
   "At_least_one_added_token_is_required_by_the_user": "사용자가 추가 한 토큰이 하나 이상 필요합니다.",
diff --git a/packages/rocketchat-i18n/i18n/ku.i18n.json b/packages/rocketchat-i18n/i18n/ku.i18n.json
index 7f71feeeb653..2f43db2b9e67 100644
--- a/packages/rocketchat-i18n/i18n/ku.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ku.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Piştrastin?",
   "Are_you_sure_you_want_to_delete_your_account": "Ma tu dizanî, tu dixwazî ​​hesabê te jê bibî?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Ma hûn bawer dikin ku hûn dixwazin întegrasyonê ya Facebookê ne?",
-  "assign-admin-role": "Role Admin",
-  "assign-admin-role_description": "Destûra biryara rêveberê din bikaribin bikarhênerên din",
   "Assign_admin": "Birêvebirin",
   "at": "ba",
   "At_least_one_added_token_is_required_by_the_user": "Ji hêla bikarhênerê kêmtir vekêşanek nû ve tête hewce ye",
diff --git a/packages/rocketchat-i18n/i18n/lo.i18n.json b/packages/rocketchat-i18n/i18n/lo.i18n.json
index 8b9df621c5fd..838c8e1161fc 100644
--- a/packages/rocketchat-i18n/i18n/lo.i18n.json
+++ b/packages/rocketchat-i18n/i18n/lo.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "ເຈົ້າ​ແນ່​ໃຈ​ບໍ່?",
   "Are_you_sure_you_want_to_delete_your_account": "ທ່ານວ່າທ່ານແມ່ນແນ່ໃຈວ່າຕ້ອງການທີ່ຈະລຶບບັນຊີຂອງທ່ານ?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "ທ່ານແນ່ໃຈວ່າທ່ານຕ້ອງການປິດການເຊື່ອມຕໍ່ເຟສບຸກ?",
-  "assign-admin-role": "Assign Admin Role",
-  "assign-admin-role_description": "ການອະນຸຍາດໃຫ້ມອບພາລະບົດບາດ admin ກັບຜູ້ໃຊ້ອື່ນໆ",
   "Assign_admin": "Assigning admin",
   "at": "ທີ່",
   "At_least_one_added_token_is_required_by_the_user": "ຢ່າງຫນ້ອຍຫນຶ່ງໂຕໂຢດເພີ່ມແມ່ນຜູ້ທີ່ຕ້ອງການ",
diff --git a/packages/rocketchat-i18n/i18n/lt.i18n.json b/packages/rocketchat-i18n/i18n/lt.i18n.json
index f8f0ba9758fb..13f5a01a48bb 100644
--- a/packages/rocketchat-i18n/i18n/lt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/lt.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Ar tu tuo tikras?",
   "Are_you_sure_you_want_to_delete_your_account": "Ar tikrai norite ištrinti savo sąskaitą?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Ar tikrai norite išjungti \"Facebook\" integraciją?",
-  "assign-admin-role": "Priskirti administratoriaus vaidmenį",
-  "assign-admin-role_description": "Leidimas priskirti administratoriaus vaidmenį kitiems naudotojams",
   "Assign_admin": "Priskirti administratorių",
   "at": "ne",
   "At_least_one_added_token_is_required_by_the_user": "Vartotojas reikalauja bent vieno papildomo raktinio žodžio",
diff --git a/packages/rocketchat-i18n/i18n/mn.i18n.json b/packages/rocketchat-i18n/i18n/mn.i18n.json
index 21cbbca7980a..4302c689e123 100644
--- a/packages/rocketchat-i18n/i18n/mn.i18n.json
+++ b/packages/rocketchat-i18n/i18n/mn.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Чи итгэлтэй байна уу?",
   "Are_you_sure_you_want_to_delete_your_account": "Та акаунтаа устгахдаа итгэлтэй байна уу?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Та Facebook-ийг нэгтгэхийг хүсч байгаадаа итгэлтэй байна уу?",
-  "assign-admin-role": "Админ үүрэг гүйцэтгэх",
-  "assign-admin-role_description": "Бусад хэрэглэгчид админ үүргийг оноох эрх",
   "Assign_admin": "Админ үүсгэх",
   "at": "at",
   "At_least_one_added_token_is_required_by_the_user": "Хэрэглэгч наад зах нь нэг нэмж жетон шаардагдана",
diff --git a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
index 247ce049c5c7..d3387c8ed654 100644
--- a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Adakah anda pasti?",
   "Are_you_sure_you_want_to_delete_your_account": "Adakah anda pasti anda mahu memadam akaun anda?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Adakah anda pasti mahu melumpuhkan integrasi Facebook?",
-  "assign-admin-role": "Berikan Peranan Admin",
-  "assign-admin-role_description": "Kebenaran untuk menyerahkan peranan pentadbir kepada pengguna lain",
   "Assign_admin": "Menugaskan pentadbir",
   "at": "pada",
   "At_least_one_added_token_is_required_by_the_user": "Sekurang-kurangnya satu tanda tambah diperlukan oleh pengguna",
diff --git a/packages/rocketchat-i18n/i18n/nl.i18n.json b/packages/rocketchat-i18n/i18n/nl.i18n.json
index eb68a4613eed..7f2e34a2da3a 100644
--- a/packages/rocketchat-i18n/i18n/nl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/nl.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Weet u het zeker?",
   "Are_you_sure_you_want_to_delete_your_account": "Weet je zeker dat je je account wilt verwijderen?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Weet je zeker dat je Facebook-integratie wilt uitschakelen?",
-  "assign-admin-role": "Wijs beheerdersrol toe",
-  "assign-admin-role_description": "Toestemming om de beheerdersrol aan andere gebruikers toe te wijzen",
   "Assign_admin": "Beheerder toewijzen",
   "at": "op",
   "At_least_one_added_token_is_required_by_the_user": "Ten minste één toegevoegd token is vereist door de gebruiker",
diff --git a/packages/rocketchat-i18n/i18n/no.i18n.json b/packages/rocketchat-i18n/i18n/no.i18n.json
index ca1d416c9a60..cd20eabe100d 100644
--- a/packages/rocketchat-i18n/i18n/no.i18n.json
+++ b/packages/rocketchat-i18n/i18n/no.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Er du sikker?",
   "Are_you_sure_you_want_to_delete_your_account": "Er du sikker på at du vil slette din konto?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Er du sikker på at du vil deaktivere Facebook-integrasjon?",
-  "assign-admin-role": "Tilordne Admin-rolle",
-  "assign-admin-role_description": "Tillatelse til å tilordne administrasjonsrollen til andre brukere",
   "Assign_admin": "Tilordne admin",
   "at": "på",
   "At_least_one_added_token_is_required_by_the_user": "Minst ett tilleggstegn kreves av brukeren",
diff --git a/packages/rocketchat-i18n/i18n/pl.i18n.json b/packages/rocketchat-i18n/i18n/pl.i18n.json
index 0e9fcdc0807b..b756fe83eb51 100644
--- a/packages/rocketchat-i18n/i18n/pl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pl.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Jesteś pewny?",
   "Are_you_sure_you_want_to_delete_your_account": "Czy na pewno chcesz usunąć swoje konto?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Czy na pewno chcesz wyłączyć integrację z Facebookiem?",
-  "assign-admin-role": "Przypisywanie roli administratora",
-  "assign-admin-role_description": "Zezwolenie na przydzielenie roli administratora innym użytkownikom",
   "Assign_admin": "Przypisywanie admina",
   "at": "w",
   "At_least_one_added_token_is_required_by_the_user": "Przynajmniej jeden dodany token jest wymagany przez użytkownika",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 364f0bc9908c..ea65557dfd1f 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Você tem certeza?",
   "Are_you_sure_you_want_to_delete_your_account": "Tem certeza de que deseja excluir a sua conta?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Tem certeza de que deseja desabilitar a integração do Facebook?",
-  "assign-admin-role": "Atribuir papel de administrador",
-  "assign-admin-role_description": "Permissão para atribuir a função de administrador a outros usuários",
   "Assign_admin": "Atribuindo administrador",
   "at": "em",
   "At_least_one_added_token_is_required_by_the_user": "Pelo menos um token adicionado é requerido pelo usuário",
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index bd14d106a70b..9f3dc0e0a4bd 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Você tem certeza?",
   "Are_you_sure_you_want_to_delete_your_account": "Tem certeza de que deseja excluir a sua conta?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Tem certeza de que deseja desabilitar a integração do Facebook?",
-  "assign-admin-role": "Atribuir papel de administrador",
-  "assign-admin-role_description": "Permissão para atribuir a função de administrador a outros usuários",
   "Assign_admin": "Atribuindo administrador",
   "at": "em",
   "At_least_one_added_token_is_required_by_the_user": "Pelo menos um token adicionado é requerido pelo usuário",
diff --git a/packages/rocketchat-i18n/i18n/ro.i18n.json b/packages/rocketchat-i18n/i18n/ro.i18n.json
index ac5a6bcffb37..49fead230a94 100644
--- a/packages/rocketchat-i18n/i18n/ro.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ro.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Sigur doriți asta?",
   "Are_you_sure_you_want_to_delete_your_account": "Sunteți sigur că doriți să ștergeți contul?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Sigur doriți să dezactivați integrarea prin Facebook?",
-  "assign-admin-role": "Atribuiți rolul de administrator",
-  "assign-admin-role_description": "Permisiunea de a atribui rolul de administrator altor utilizatori",
   "Assign_admin": "Se atribuie admin",
   "at": "la",
   "At_least_one_added_token_is_required_by_the_user": "Cel puțin un atribut adăugat este necesar de către utilizator",
diff --git a/packages/rocketchat-i18n/i18n/ru.i18n.json b/packages/rocketchat-i18n/i18n/ru.i18n.json
index 6f5114cc3966..3bc1b870f867 100644
--- a/packages/rocketchat-i18n/i18n/ru.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ru.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Вы уверены?",
   "Are_you_sure_you_want_to_delete_your_account": "Вы уверены, что хотите удалить свою учетную запись?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Вы действительно хотите отключить интеграцию с Facebook?",
-  "assign-admin-role": "Назначить на роль Администратора",
-  "assign-admin-role_description": "Разрешение назначить на роль Администратора другим пользователям",
   "Assign_admin": "Назначенный администратор",
   "at": "в",
   "At_least_one_added_token_is_required_by_the_user": "Пользователь, по крайней мере, один добавленный токен",
diff --git a/packages/rocketchat-i18n/i18n/sk-SK.i18n.json b/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
index dc70899f4cae..399b79405c07 100644
--- a/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Si si istý?",
   "Are_you_sure_you_want_to_delete_your_account": "Naozaj chcete odstrániť svoj účet?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Naozaj chcete zakázať integráciu do služby Facebook?",
-  "assign-admin-role": "Priraďte rolu administrátora",
-  "assign-admin-role_description": "Povolenie priradiť administráciu ostatným používateľom",
   "Assign_admin": "Priradenie administrátora",
   "at": "na",
   "At_least_one_added_token_is_required_by_the_user": "Najmenej jeden pridaný token vyžaduje užívateľ",
diff --git a/packages/rocketchat-i18n/i18n/sl-SI.i18n.json b/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
index 4c9dd133493b..935095003b43 100644
--- a/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
@@ -264,8 +264,6 @@
   "Are_you_sure": "Ste prepričani?",
   "Are_you_sure_you_want_to_delete_your_account": "Ste prepričani, da želite izbrisati svoj račun?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Ste prepričani, da želite onemogočiti integracijo Facebooka?",
-  "assign-admin-role": "Dodeli skrbniško vlogo",
-  "assign-admin-role_description": "Dovoljenje za dodeljevanje skrbniških vlog ostalim uporabnikom",
   "Assign_admin": "Dodeljevanje skrbnika",
   "at": "na",
   "At_least_one_added_token_is_required_by_the_user": "Uporabnik zahteva vsaj en dodan žeton",
diff --git a/packages/rocketchat-i18n/i18n/sq.i18n.json b/packages/rocketchat-i18n/i18n/sq.i18n.json
index 1de587018ed9..419f236fc725 100644
--- a/packages/rocketchat-i18n/i18n/sq.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sq.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Jeni i sigurt?",
   "Are_you_sure_you_want_to_delete_your_account": "Jeni te sigurte qe doni te fshini llogarinë tuaj?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Je i sigurt që dëshiron ta çaktivizosh integrimin në Facebook?",
-  "assign-admin-role": "Cakto Roli i Adminit",
-  "assign-admin-role_description": "Leja për të caktuar rolin e administratorit tek përdoruesit e tjerë",
   "Assign_admin": "Caktimi i administratorit",
   "at": "në",
   "At_least_one_added_token_is_required_by_the_user": "Të paktën një shenjë shtesë kërkohet nga përdoruesi",
diff --git a/packages/rocketchat-i18n/i18n/sr.i18n.json b/packages/rocketchat-i18n/i18n/sr.i18n.json
index f5ad03e2787d..ec1c68d20fd7 100644
--- a/packages/rocketchat-i18n/i18n/sr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sr.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Да ли сте сигурни?",
   "Are_you_sure_you_want_to_delete_your_account": "Да ли сте сигурни да желите да избришете свој налог?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Да ли сте сигурни да желите онемогућити интеграцију Фацебоок-а?",
-  "assign-admin-role": "Додели улогу администратора",
-  "assign-admin-role_description": "Дозвола доделити улогу администратора другим корисницима",
   "Assign_admin": "Додељивање администратора",
   "at": "у",
   "At_least_one_added_token_is_required_by_the_user": "Корисник захтева бар један додатни токен",
diff --git a/packages/rocketchat-i18n/i18n/sv.i18n.json b/packages/rocketchat-i18n/i18n/sv.i18n.json
index c9a7348d6e20..37164830a3c7 100644
--- a/packages/rocketchat-i18n/i18n/sv.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sv.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Är du säker?",
   "Are_you_sure_you_want_to_delete_your_account": "Är du säker på att du vill radera ditt konto?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Är du säker på att du vill inaktivera Facebook-integration?",
-  "assign-admin-role": "Tilldela administratörsrollen",
-  "assign-admin-role_description": "Tillstånd att tilldela administratörsrollen till andra användare",
   "Assign_admin": "Tilldela administratör",
   "at": "på",
   "At_least_one_added_token_is_required_by_the_user": "Minst en tilläggs token krävs av användaren",
diff --git a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
index 40cc0597c4e7..d0a69380f0e6 100644
--- a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "நீ சொல்வது உறுதியா?",
   "Are_you_sure_you_want_to_delete_your_account": "நீங்கள் உங்கள் கணக்கை நீக்க வேண்டும் நீங்கள் உறுதியாக இருக்கிறீர்களா?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "நீங்கள் பேஸ்புக் ஒருங்கிணைப்பை முடக்க வேண்டுமா?",
-  "assign-admin-role": "நிர்வாகப் பணியை ஒதுக்குக",
-  "assign-admin-role_description": "மற்ற பயனர்களுக்கு நிர்வாக பாத்திரத்தை ஒதுக்க அனுமதி",
   "Assign_admin": "நிர்வாகி நியமித்தல்",
   "at": "மணிக்கு",
   "At_least_one_added_token_is_required_by_the_user": "குறைந்தது ஒரு சேர்க்கப்பட்ட டோக்கன் பயனர் தேவைப்படுகிறது",
diff --git a/packages/rocketchat-i18n/i18n/th-TH.i18n.json b/packages/rocketchat-i18n/i18n/th-TH.i18n.json
index cee172672184..fbe46c8c756d 100644
--- a/packages/rocketchat-i18n/i18n/th-TH.i18n.json
+++ b/packages/rocketchat-i18n/i18n/th-TH.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "คุณแน่ใจไหม?",
   "Are_you_sure_you_want_to_delete_your_account": "คุณแน่ใจหรือไม่ว่าต้องการลบบัญชีของคุณ?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "คุณแน่ใจหรือไม่ว่าต้องการปิดการใช้งาน Facebook integration?",
-  "assign-admin-role": "กำหนดบทบาทผู้ดูแลระบบ",
-  "assign-admin-role_description": "ได้รับอนุญาตให้มอบหมายบทบาทผู้ดูแลระบบให้กับผู้ใช้รายอื่น",
   "Assign_admin": "กำลังมอบหมายผู้ดูแลระบบ",
   "at": "ที่",
   "At_least_one_added_token_is_required_by_the_user": "ต้องมีโทเค็นเพิ่มอย่างน้อยหนึ่งตัวโดยผู้ใช้",
diff --git a/packages/rocketchat-i18n/i18n/tr.i18n.json b/packages/rocketchat-i18n/i18n/tr.i18n.json
index 2c74514cd102..960d31baa5f4 100644
--- a/packages/rocketchat-i18n/i18n/tr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/tr.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Emin misiniz?",
   "Are_you_sure_you_want_to_delete_your_account": "Hesabınızı silmek istediğinizden emin misiniz?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Facebook entegrasyonunu devre dışı bırakmak istediğinizden emin misiniz?",
-  "assign-admin-role": "Admin Rolü Ata",
-  "assign-admin-role_description": "Diğer kullanıcılara admin rolü atama izmi",
   "Assign_admin": "Yönetici Görevlendiriliyor",
   "at": "at",
   "At_least_one_added_token_is_required_by_the_user": "Kullanıcı tarafından en az bir ek belirteç gereklidir",
diff --git a/packages/rocketchat-i18n/i18n/uk.i18n.json b/packages/rocketchat-i18n/i18n/uk.i18n.json
index 8b8dad201ca2..913210b83c5f 100644
--- a/packages/rocketchat-i18n/i18n/uk.i18n.json
+++ b/packages/rocketchat-i18n/i18n/uk.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "Ти впевнений?",
   "Are_you_sure_you_want_to_delete_your_account": "Ви впевнені, що хочете видалити свій аккаунт?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Ви впевнені що бажаєте відключити інтеграцію із Facebook?",
-  "assign-admin-role": "Призначити роль Адміністратора",
-  "assign-admin-role_description": "Дозвіл на призначення ролі Адміністратора іншим користувачам",
   "Assign_admin": "Призначаємо адмністратора",
   "at": "в",
   "At_least_one_added_token_is_required_by_the_user": "Потрібно добавити токен для користувача",
diff --git a/packages/rocketchat-i18n/i18n/vi-VN.i18n.json b/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
index db0495186d36..2a442f9ae9fe 100644
--- a/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
+++ b/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
@@ -255,8 +255,6 @@
   "Are_you_sure": "Bạn có chắc không?",
   "Are_you_sure_you_want_to_delete_your_account": "Bạn có chắc rằng bạn muốn xóa tài khoản của bạn?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Bạn có chắc chắn muốn vô hiệu hoá hội nhập Facebook?",
-  "assign-admin-role": "Gán vai trò quản trị",
-  "assign-admin-role_description": "Cho phép gán vai trò quản trị cho người dùng khác",
   "Assign_admin": "Chỉ định quản trị viên",
   "at": "tại",
   "At_least_one_added_token_is_required_by_the_user": "Ít nhất một mã thông báo bổ sung được yêu cầu bởi người dùng",
diff --git a/packages/rocketchat-i18n/i18n/zh-HK.i18n.json b/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
index 9ccf151a721e..01eb34651c72 100644
--- a/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "你确定吗？",
   "Are_you_sure_you_want_to_delete_your_account": "您确定要删除您的帐户吗？",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "你确定要禁用Facebook集成吗？",
-  "assign-admin-role": "分配管理员角色",
-  "assign-admin-role_description": "将管理员角色分配给其他用户的权限",
   "Assign_admin": "分配管理员",
   "at": "在",
   "At_least_one_added_token_is_required_by_the_user": "用户至少需要添加一个令牌",
diff --git a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
index 48b0fdadc501..e1d0ffe20151 100644
--- a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "確定？",
   "Are_you_sure_you_want_to_delete_your_account": "確定要刪除自己的帳戶？",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "你確定要停用Facebook整合嗎？",
-  "assign-admin-role": "指派管理員角色",
-  "assign-admin-role_description": "指派管理員角色給其他使用者的權限",
   "Assign_admin": "指派管理員中",
   "at": "於",
   "At_least_one_added_token_is_required_by_the_user": "用戶至少需要添加一個令牌",
diff --git a/packages/rocketchat-i18n/i18n/zh.i18n.json b/packages/rocketchat-i18n/i18n/zh.i18n.json
index 4dab1a44a3ef..4cf018b67fb6 100644
--- a/packages/rocketchat-i18n/i18n/zh.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh.i18n.json
@@ -265,8 +265,6 @@
   "Are_you_sure": "你确定吗？",
   "Are_you_sure_you_want_to_delete_your_account": "您确定要删除您的帐号吗？",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "你确定要禁用Facebook集成吗？",
-  "assign-admin-role": "分配管理员角色",
-  "assign-admin-role_description": "将管理员角色分配给其他用户的权限",
   "Assign_admin": "分配管理员",
   "at": "在",
   "At_least_one_added_token_is_required_by_the_user": "用户至少需要添加一个令牌",
diff --git a/packages/rocketchat-lib/server/functions/saveUser.js b/packages/rocketchat-lib/server/functions/saveUser.js
index b3d7ff730e07..ab42253ea57e 100644
--- a/packages/rocketchat-lib/server/functions/saveUser.js
+++ b/packages/rocketchat-lib/server/functions/saveUser.js
@@ -13,6 +13,13 @@ RocketChat.saveUser = function(userId, userData) {
 		});
 	}
 
+	if (RocketChat.authz.hasRole(userData._id, 'admin') && _.indexOf(userData.roles, 'admin') < 0 && !RocketChat.authz.hasRole(user._id, 'admin')) {
+		throw new Meteor.Error('error-action-not-allowed', 'Removing admin role is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Assign_admin'
+		});
+	}
+
 	if (!userData._id && !RocketChat.authz.hasPermission(userId, 'create-user')) {
 		throw new Meteor.Error('error-action-not-allowed', 'Adding user is not allowed', {
 			method: 'insertOrUpdateUser',
@@ -27,7 +34,7 @@ RocketChat.saveUser = function(userId, userData) {
 		});
 	}
 
-	if (userData.roles && _.indexOf(userData.roles, 'admin') >= 0 && !RocketChat.authz.hasPermission(userId, 'assign-admin-role')) {
+	if (userData.roles && _.indexOf(userData.roles, 'admin') >= 0 && !RocketChat.authz.hasRole(user._id, 'admin')) {
 		throw new Meteor.Error('error-action-not-allowed', 'Assigning admin is not allowed', {
 			method: 'insertOrUpdateUser',
 			action: 'Assign_admin'
diff --git a/packages/rocketchat-lib/server/methods/setAdminStatus.js b/packages/rocketchat-lib/server/methods/setAdminStatus.js
index 694d277a2866..68d6116e2de9 100644
--- a/packages/rocketchat-lib/server/methods/setAdminStatus.js
+++ b/packages/rocketchat-lib/server/methods/setAdminStatus.js
@@ -8,7 +8,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'setAdminStatus' });
 		}
 
-		if (RocketChat.authz.hasPermission(Meteor.userId(), 'assign-admin-role') !== true) {
+		if (RocketChat.authz.hasRole(Meteor.userId(), 'admin') !== true) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setAdminStatus' });
 		}
 
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userActions.js b/packages/rocketchat-ui-flextab/client/tabs/userActions.js
index 6f79c1c68d10..03d75c9a88c4 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/userActions.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/userActions.js
@@ -431,7 +431,7 @@ export const getActions = function({ user, directActions, hideAdminControls }) {
 			group: 'admin',
 			condition: () => !hideAdminControls && hasPermission('delete-user')
 		}, () => {
-			if (hideAdminControls || !hasPermission('assign-admin-role')) {
+			if (hideAdminControls || !RocketChat.authz.hasRole(user._id, 'admin')) {
 				return;
 			}
 			if (hasAdminRole()) {