diff --git a/src/app/system/system.component.html b/src/app/system/system.component.html
index 90ff221d8..458cb0b8c 100644
--- a/src/app/system/system.component.html
+++ b/src/app/system/system.component.html
@@ -335,11 +335,11 @@
             </p>
           </mat-list-item>
 
-          <mat-list-item>
+          <mat-list-item [ngClass]="{ 'disabled-item': isDisabled }">
             <mat-icon matListIcon>
               <fa-icon icon="key" size="sm"></fa-icon>
             </mat-icon>
-            <h4 matLine>{{ 'labels.heading.Two-Factor Configuration' | translate }}</h4>
+            <h4 matLine>{{ 'labels.heading.Two-Factor Authentication' | translate }}</h4>
             <fa-icon
               (click)="arrowBooleansToggle(14); $event.stopPropagation()"
               *ngIf="!arrowBooleans[14]"
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json
index 57981356c..e985b6598 100644
--- a/src/assets/translations/cs-CS.json
+++ b/src/assets/translations/cs-CS.json
@@ -1120,7 +1120,7 @@
       "Transferred To": "Převeden k",
       "Transferring From Details": "Přenos z podrobností",
       "Tree View": "Stromový pohled",
-      "Two-Factor Configuration": "Dvoufaktorová konfigurace",
+      "Two-Factor Authentication": "Dvoufaktorová ověření",
       "Unassign Role": "Zrušit přiřazení role",
       "Unassign Staff": "Zrušit přidělení personálu",
       "Undo": "vrátit",
diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
index b26734128..b8c93ae3e 100644
--- a/src/assets/translations/de-DE.json
+++ b/src/assets/translations/de-DE.json
@@ -1121,7 +1121,7 @@
       "Transferred To": "Übertragen auf",
       "Transferring From Details": "Von Details übertragen",
       "Tree View": "Baumsicht",
-      "Two-Factor Configuration": "Zwei-Faktor-Konfiguration",
+      "Two-Factor Authentication": "Zwei-Faktor-Authentifizierung",
       "Unassign Role": "Rollenzuweisung aufheben",
       "Unassign Staff": "Personalzuweisung aufheben",
       "Undo": "Rückgängig machen",
diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
index 3debc1f29..f44815011 100644
--- a/src/assets/translations/en-US.json
+++ b/src/assets/translations/en-US.json
@@ -1124,7 +1124,7 @@
       "Transferred To": "Transferred To",
       "Transferring From Details": "Transferring From Details",
       "Tree View": "Tree View",
-      "Two-Factor Configuration": "Two-Factor Configuration",
+      "Two-Factor Authentication": "Two-Factor Authentication",
       "Unassign Role": "Unassign Role",
       "Unassign Staff": "Unassign Staff",
       "Undo": "Undo",
diff --git a/src/assets/translations/es-CL.json b/src/assets/translations/es-CL.json
index 4178f9980..853b4fe1e 100644
--- a/src/assets/translations/es-CL.json
+++ b/src/assets/translations/es-CL.json
@@ -1120,7 +1120,7 @@
       "Transferred To": "Transferido a",
       "Transferring From Details": "Transferir desde detalles",
       "Tree View": "Vista de árbol",
-      "Two-Factor Configuration": "Configuración de dos factores",
+      "Two-Factor Authentication": "Autenticación de dos factores",
       "Unassign Role": "Desasignar rol",
       "Unassign Staff": "Desasignar Asesor",
       "Undo": "Deshacer",
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
index 5220ef251..44fa099ad 100644
--- a/src/assets/translations/es-MX.json
+++ b/src/assets/translations/es-MX.json
@@ -1120,7 +1120,7 @@
       "Transferred To": "Transferido a",
       "Transferring From Details": "Transferir desde detalles",
       "Tree View": "Vista de árbol",
-      "Two-Factor Configuration": "Configuración de dos factores",
+      "Two-Factor Authentication": "Autenticación de dos factores",
       "Unassign Role": "Desasignar rol",
       "Unassign Staff": "Desasignar Asesor",
       "Undo": "Deshacer",
diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
index f0ecba178..9d5762456 100644
--- a/src/assets/translations/fr-FR.json
+++ b/src/assets/translations/fr-FR.json
@@ -1121,7 +1121,7 @@
       "Transferred To": "Transféré à",
       "Transferring From Details": "Transfert depuis les détails",
       "Tree View": "Vue arborescente",
-      "Two-Factor Configuration": "Configuration à deux facteurs",
+      "Two-Factor Authentication": "Authentification à deux facteurs",
       "Unassign Role": "Annuler l'attribution d'un rôle",
       "Unassign Staff": "Annuler l'affectation du personnel",
       "Undo": "annuler",
diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json
index 4e947560f..73c884345 100644
--- a/src/assets/translations/it-IT.json
+++ b/src/assets/translations/it-IT.json
@@ -1121,7 +1121,7 @@
       "Transferred To": "Trasferito a",
       "Transferring From Details": "Trasferimento dai dettagli",
       "Tree View": "Visualizzazione ad albero",
-      "Two-Factor Configuration": "Configurazione a due fattori",
+      "Two-Factor Authentication": "Autenticazione a due fattori",
       "Unassign Role": "Annulla assegnazione ruolo",
       "Unassign Staff": "Annulla assegnazione del personale",
       "Undo": "Disfare",
diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
index 9cb67d3ef..7b4c858da 100644
--- a/src/assets/translations/ko-KO.json
+++ b/src/assets/translations/ko-KO.json
@@ -1122,7 +1122,7 @@
       "Transferred To": "로 전송",
       "Transferring From Details": "세부정보에서 전송 중",
       "Tree View": "트리뷰",
-      "Two-Factor Configuration": "2단계 구성",
+      "Two-Factor Authentication": "2단계 입증",
       "Unassign Role": "역할 할당 해제",
       "Unassign Staff": "직원 할당 해제",
       "Undo": "실행 취소",
diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
index e8c304173..ff9ee9dff 100644
--- a/src/assets/translations/lt-LT.json
+++ b/src/assets/translations/lt-LT.json
@@ -1121,7 +1121,7 @@
       "Transferred To": "Perkelta į",
       "Transferring From Details": "Perkėlimas iš detalių",
       "Tree View": "Medžio vaizdas",
-      "Two-Factor Configuration": "Dviejų faktorių konfigūracija",
+      "Two-Factor Authentication": "Dviejų faktorių autentifikavimas",
       "Unassign Role": "Atšaukti vaidmens priskyrimą",
       "Unassign Staff": "Atšaukti personalo priskyrimą",
       "Undo": "Anuliuoti",
diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
index 1320ce0fa..27f95fd9b 100644
--- a/src/assets/translations/lv-LV.json
+++ b/src/assets/translations/lv-LV.json
@@ -1121,7 +1121,7 @@
       "Transferred To": "Pārsūtīts uz",
       "Transferring From Details": "Pārsūtīšana no detaļām",
       "Tree View": "Koka skats",
-      "Two-Factor Configuration": "Divu faktoru konfigurācija",
+      "Two-Factor Authentication": "Divu faktoru autentifikācija",
       "Unassign Role": "Atcelt lomas piešķiršanu",
       "Unassign Staff": "Atcelt personāla piešķiršanu",
       "Undo": "Atsaukt",
diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
index be41de08c..dad28af8f 100644
--- a/src/assets/translations/ne-NE.json
+++ b/src/assets/translations/ne-NE.json
@@ -1121,7 +1121,7 @@
       "Transferred To": "मा हस्तान्तरण गरियो",
       "Transferring From Details": "विवरणहरूबाट स्थानान्तरण गर्दै",
       "Tree View": "रूख दृश्य",
-      "Two-Factor Configuration": "दुई-कारक कन्फिगरेसन",
+      "Two-Factor Authentication": "दुई-कारक प्रमाणीकरण",
       "Unassign Role": "भूमिका अनअसाइन गर्नुहोस्",
       "Unassign Staff": "कर्मचारी नियुक्ति रद्द गर्नुहोस्",
       "Undo": "पूर्ववत गर्नुहोस्",
diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
index 98a198bba..616ef1d3b 100644
--- a/src/assets/translations/pt-PT.json
+++ b/src/assets/translations/pt-PT.json
@@ -1121,7 +1121,7 @@
       "Transferred To": "Transferido para",
       "Transferring From Details": "Transferindo de detalhes",
       "Tree View": "Vista em árvore",
-      "Two-Factor Configuration": "Configuração de dois fatores",
+      "Two-Factor Authentication": "Autenticação de dois fatores",
       "Unassign Role": "Cancelar atribuição de função",
       "Unassign Staff": "Cancelar atribuição de equipe",
       "Undo": "Desfazer",
diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json
index 0879a7430..393f841d5 100644
--- a/src/assets/translations/sw-SW.json
+++ b/src/assets/translations/sw-SW.json
@@ -1121,7 +1121,7 @@
       "Transferred To": "Imehamishwa Kwa",
       "Transferring From Details": "Kuhamisha Kutoka kwa Maelezo",
       "Tree View": "Mtazamo wa Mti",
-      "Two-Factor Configuration": "Usanidi wa Mambo Mbili",
+      "Two-Factor Authentication": "Uthibitishaji wa Vipengele Viwili",
       "Unassign Role": "Batilisha Wajibu",
       "Unassign Staff": "Batilisha Wafanyikazi",
       "Undo": "Tendua",