diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
index ad584f304f1c..5c1a0471845d 100644
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "አይነታ"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "በራስ ሰር ዘግቶ መውጫ ሰዓት ቆጣሪ (ደቂቃ)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "MetaMask በራስ ሰር መንገድ ዘግቶ ከመውጣቱ በፊት የቦዘነ ጊዜን በደቂቃዎች ሙላ"
   },
   "average": {
@@ -648,10 +648,7 @@
   "loadMore": {
     "message": "ተጨማሪ ጫን"
   },
-  "login": {
-    "message": "በመለያ ግባ"
-  },
-  "logout": {
+  "lock": {
     "message": "ዘግተህ ውጣ"
   },
   "mainnet": {
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
index 464dbf22f222..0ba0421270e5 100644
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "الصفات"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "مؤقت تسجيل الخروج التلقائي (بالدقائق)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "اضبط مهلة السكون بالدقائق التي يقوم MetaMask بتسجيل الخروج بعدها تلقائيًا"
   },
   "average": {
@@ -644,10 +644,7 @@
   "localhost": {
     "message": "المضيف المحلي 8545"
   },
-  "login": {
-    "message": "تسجيل الدخول"
-  },
-  "logout": {
+  "lock": {
     "message": "تسجيل الخروج"
   },
   "mainnet": {
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
index 620660809b75..87211117857a 100644
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Функции"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Таймер за автоматично излизане (минути)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Задайте времето на неактивност в минути, преди MetaMask автоматично да Ви отпише от акаунта"
   },
   "average": {
@@ -647,10 +647,7 @@
   "localhost": {
     "message": "Локален хост 8545"
   },
-  "login": {
-    "message": "Вход"
-  },
-  "logout": {
+  "lock": {
     "message": "Излизане"
   },
   "mainnet": {
diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
index a5aa8f366f90..869281bebb06 100644
--- a/app/_locales/bn/messages.json
+++ b/app/_locales/bn/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "গুণাবলী"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "স্বয়ংক্রিয়-লগ আউট টাইমার (মিনিট)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "MetaMask স্বয়ংক্রিয়ভাবে লগ আউট করার আগে নিষ্ক্রিয় থাকার সময় মিনিটে সেট করুন"
   },
   "average": {
@@ -651,10 +651,7 @@
   "localhost": {
     "message": "লোকালহোস্ট 8545"
   },
-  "login": {
-    "message": "লগইন করুন"
-  },
-  "logout": {
+  "lock": {
     "message": "লগ আউট করুন"
   },
   "mainnet": {
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
index 042e4b25859b..201d321e0289 100644
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Atribucions"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Temporitzador de tancament de sessió automàtic (minuts)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Configura el temps de repòs com minuts abans que MetaMask tanqui la sessió automàticament"
   },
   "average": {
@@ -635,10 +635,7 @@
   "localhost": {
     "message": "Host local 8545"
   },
-  "login": {
-    "message": "Inicia sessió"
-  },
-  "logout": {
+  "lock": {
     "message": "Tanca la sessió"
   },
   "mainnet": {
diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
index af425200955b..aa6660055267 100644
--- a/app/_locales/cs/messages.json
+++ b/app/_locales/cs/messages.json
@@ -268,10 +268,10 @@
   "loadingTokens": {
     "message": "Načítám tokeny..."
   },
-  "login": {
+  "unlock": {
     "message": "Přihlásit"
   },
-  "logout": {
+  "lock": {
     "message": "Odhlásit"
   },
   "message": {
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
index c4e5105ff117..88b457aeceb2 100644
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Tilskrivninger"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Timer for automatisk udlogning (minutter)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Indstil den passive tid i minutter, før MetaMask automatisk logger dig ud"
   },
   "average": {
@@ -638,10 +638,7 @@
   "loadMore": {
     "message": "Indlæs Mere"
   },
-  "login": {
-    "message": "Log Ind"
-  },
-  "logout": {
+  "lock": {
     "message": "Log ud"
   },
   "mainnet": {
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index f9a79022378c..69d31d5948e3 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -106,10 +106,10 @@
   "attributions": {
     "message": "Was wir verwenden"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Auto-Logout-Timer (Minuten)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Stellen Sie die Ruhezeit in Minuten ein, nach der sich MetaMask automatisch ausloggen soll"
   },
   "average": {
@@ -627,10 +627,7 @@
   "loadMore": {
     "message": "Mehr laden"
   },
-  "login": {
-    "message": "Login"
-  },
-  "logout": {
+  "lock": {
     "message": "Ausloggen"
   },
   "mainnet": {
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 3f152fc6af62..84efaf273f6a 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Αποδόσεις"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Χρονόμετρο Αυτόματης Αποσύνδεσης (λεπτά)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Ρυθμίστε τον χρόνο αδράνειας σε λεπτά πριν αποσυνδεθεί αυτόματα το MetaMask"
   },
   "average": {
@@ -648,10 +648,7 @@
   "localhost": {
     "message": "Τοπικός Υπολογιστής  8545"
   },
-  "login": {
-    "message": "Σύνδεση"
-  },
-  "logout": {
+  "lock": {
     "message": "Αποσύνδεση"
   },
   "mainnet": {
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 6dae633db035..192bb358499b 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -155,10 +155,10 @@
   "attributions": {
     "message": "Attributions"
   },
-  "autoLogoutTimeLimit": {
-    "message": "Auto-Logout Timer (minutes)"
+  "autoLockTimeLimit": {
+    "message": "Auto-Lock Timer (minutes)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Set the idle time in minutes before ConfluxPortal will automatically log out"
   },
   "average": {
@@ -791,14 +791,11 @@
   "localhost": {
     "message": "Localhost 12539"
   },
-  "login": {
-    "message": "Log In"
+  "lock": {
+    "message": "Lock"
   },
-  "logout": {
-    "message": "Log out"
-  },
-  "logoutTimeTooGreat": {
-    "message": "Logout time is too great"
+  "lockTimeTooGreat": {
+    "message": "Lock time is too great"
   },
   "mainnet": {
     "message": "Conflux Main Network (not released yet, fallback to conflux test net)"
@@ -1318,7 +1315,7 @@
     "message": "3. Start using dApps and more!"
   },
   "step3HardwareWalletMsg": {
-    "message": "Use your hardware account like you would with any Conflux account. Log in to dApps, send CFX, buy and store ERC20 tokens and Non-Fungible tokens like CryptoKitties. (hardware account is not fulled tested, use with your own risk)"
+    "message": "Use your hardware account like you would with any Conflux account. Log in to dApps, send CFX, buy and store ERC20 tokens and Non-Fungible tokens like CryptoKitties. (hardware account is not fully tested, use with your own risk)"
   },
   "storePhrase": {
     "message": "Store this phrase in a password manager like 1Password."
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 9e83d05d96e0..32c6bb15f568 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -106,10 +106,10 @@
   "attributions": {
     "message": "Atribuciones"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Temporizador Auto-Cierre (minutos)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Establece el tiempo de inactividad en minutos antes de que MetaMask cierre la sesión automáticamente."
   },
   "average": {
@@ -533,10 +533,7 @@
   "loadMore": {
     "message": "Cargar Más"
   },
-  "login": {
-    "message": "Ingresar"
-  },
-  "logout": {
+  "lock": {
     "message": "Cerrar sesión"
   },
   "mainnet": {
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index b6ab61496e62..e2d386e0a5da 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Atribuciones"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Temporizador de cierre de sesión automático (minutos)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Configura tu tiempo de inactividad en minutos para controlar cuándo MetaMask cerrará tu sesión de forma automática"
   },
   "average": {
@@ -639,10 +639,7 @@
   "loadMore": {
     "message": "Cargar más"
   },
-  "login": {
-    "message": "Iniciar sesión"
-  },
-  "logout": {
+  "lock": {
     "message": "Cerrar sesión"
   },
   "mainnet": {
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
index e11a90b1619e..3946d4fad8db 100644
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Omistamised"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Automaatse väljalogimise taimer (minutites)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Seadistage jõudeolek minutites, enne kui MetaMask automaatselt välja logib"
   },
   "average": {
@@ -641,10 +641,7 @@
   "loadMore": {
     "message": "Laadi rohkem"
   },
-  "login": {
-    "message": "Logi sisse"
-  },
-  "logout": {
+  "lock": {
     "message": "Logi välja"
   },
   "mainnet": {
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
index d12b19fb831e..94c041ff98fb 100644
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "مواصفات"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "زمان سنج خروج-خودکار (دقایق)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "زمان های بیکار را به شکل دقیقه قبل از خروج MetaMask تنظیم کنید"
   },
   "average": {
@@ -651,10 +651,7 @@
   "localhost": {
     "message": "Localhost 8545 "
   },
-  "login": {
-    "message": "ورود"
-  },
-  "logout": {
+  "lock": {
     "message": "خروج"
   },
   "mainnet": {
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
index 5b0a5f8eda6e..61df7c813c42 100644
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Attribuutiot"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Automaattisen uloskirjautumisen ajastin (minuuttia)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Määritä, montako minuuttia MetaMask on ollut joutilaana ennen kuin sinut kirjataan automaattisesti ulos"
   },
   "average": {
@@ -648,10 +648,7 @@
   "localhost": {
     "message": "Paikallisjoukko 8545"
   },
-  "login": {
-    "message": "Kirjaudu sisään"
-  },
-  "logout": {
+  "lock": {
     "message": "Kirjaudu ulos"
   },
   "mainnet": {
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
index 91cfba4c95e8..55caf4741271 100644
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@@ -100,10 +100,10 @@
   "attributions": {
     "message": "Mga Attribution"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Auto-Logout Timer (minuto)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "I-set ang idle time na minuto bago awtomatikong mag-log out ang MetaMask"
   },
   "back": {
@@ -595,10 +595,7 @@
   "loadMore": {
     "message": "Mag-load Pa"
   },
-  "login": {
-    "message": "Mag-log In"
-  },
-  "logout": {
+  "lock": {
     "message": "Mag-log out"
   },
   "memorizePhrase": {
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 2f02eb8bb83e..5eb4dc066054 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -106,10 +106,10 @@
   "attemptToCancelDescription": {
     "message": "Faire une demande d'annulation ne garantit pas que votre transaction originale sera bien annulée. Dans le cas où l'annulation réussit, vous payerez les frais de transaction indiqués ci-dessus."
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Minuterie de déconnexion automatique (minutes)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Réglez le temps d'inactivité en minutes avant que MetaMask ne se déconnecte automatiquement."
   },
   "average": {
@@ -636,10 +636,7 @@
   "loadMore": {
     "message": "Charger plus"
   },
-  "login": {
-    "message": "Connexion"
-  },
-  "logout": {
+  "lock": {
     "message": "Déconnexion"
   },
   "mainnet": {
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
index 3ee07502bcaa..c7e14dc771ee 100644
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "תכונות"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "טיימר התנתקות אוטומטית (דקות)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "הגדר/י את זמן היעדר הפעילות בדקות לפני ש-MetaMask יתנתק אוטומטית."
   },
   "average": {
@@ -648,10 +648,7 @@
   "loadMore": {
     "message": "טען עוד"
   },
-  "login": {
-    "message": "כניסה"
-  },
-  "logout": {
+  "lock": {
     "message": "התנתקות"
   },
   "mainnet": {
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 46e3ef87a79d..9a2f69614d1c 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "विशेषताएं"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "ऑटो-लॉगआउट टाइमर (मिनट)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "मेटामास्क से स्वचालित रूप से लॉग आउट होने से पहले निष्क्रिय समय को मिनटों में सेट करें"
   },
   "average": {
@@ -648,10 +648,7 @@
   "localhost": {
     "message": "लोकलहोस्ट 8545"
   },
-  "login": {
-    "message": "लॉग इन करें"
-  },
-  "logout": {
+  "lock": {
     "message": "लॉग आउट"
   },
   "mainnet": {
diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json
index a9658e3a14d6..3ce391719788 100644
--- a/app/_locales/hn/messages.json
+++ b/app/_locales/hn/messages.json
@@ -248,10 +248,10 @@
   "localhost": {
     "message": "स्थानीयहोस्ट 8545"
   },
-  "login": {
+  "unlock": {
     "message": "लॉग इन करें"
   },
-  "logout": {
+  "lock": {
     "message": "लॉग आउट करें"
   },
   "mainnet": {
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
index 535d824ab011..e3ce9f2b7d4d 100644
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Svojstva"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Brojač za automatsko odjavljivanje (minute)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Postavite stanje u mirovanju u minutama prije nego što se MetaMask automatski odjavi"
   },
   "average": {
@@ -644,10 +644,7 @@
   "loadMore": {
     "message": "Učitaj više"
   },
-  "login": {
-    "message": "Prijava"
-  },
-  "logout": {
+  "lock": {
     "message": "Odjava"
   },
   "mainnet": {
diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json
index a5ff121ad524..6ca9b5c44168 100644
--- a/app/_locales/ht/messages.json
+++ b/app/_locales/ht/messages.json
@@ -386,10 +386,7 @@
   "loadingTokens": {
     "message": "Telechaje Tokens..."
   },
-  "login": {
-    "message": "Ouvri"
-  },
-  "logout": {
+  "lock": {
     "message": "Dekonekte"
   },
   "mainnet": {
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
index 41e065e8b82d..1794413e1b59 100644
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Attribúciók"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Automatikus kijelentkezés időzítő (perc)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Adja meg a MetaMask automatikus kijelentkezéséig tartó tétlen állapot idejét percekben "
   },
   "average": {
@@ -644,10 +644,7 @@
   "loadMore": {
     "message": "Továbbiak betöltése"
   },
-  "login": {
-    "message": "Belépés"
-  },
-  "logout": {
+  "lock": {
     "message": "Kilépés"
   },
   "mainnet": {
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index dd36a414187a..5ca31e394807 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Atribusi"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Jangka Waktu Keluar-Otomatis (menit)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Atur waktu diam dalam menit sebelum MetaMask mengeluarkan Anda secara otomatis"
   },
   "average": {
@@ -635,10 +635,7 @@
   "loadMore": {
     "message": "Muat Lainnya"
   },
-  "login": {
-    "message": "Masuk"
-  },
-  "logout": {
+  "lock": {
     "message": "Keluar"
   },
   "mainnet": {
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 5cb30244d9ab..3b7a4870cb3b 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -103,10 +103,10 @@
   "attributions": {
     "message": "Attribuzioni"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Timer di Logout Automatico (minuti)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Imposta il tempo di inattività dopo il quale MetaMask fa il log out automaticamente"
   },
   "average": {
@@ -624,10 +624,7 @@
   "loadMore": {
     "message": "Carica di più"
   },
-  "login": {
-    "message": "Accedi"
-  },
-  "logout": {
+  "lock": {
     "message": "Disconnetti"
   },
   "mainnet": {
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 91a417449570..2cb64059c8ee 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -106,10 +106,10 @@
   "attributions": {
     "message": "属性"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "自動ログアウト(分)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "MetaMaskが自動的にログアウトするまでのアイドル時間を分単位で設定します。"
   },
   "average": {
@@ -314,10 +314,10 @@
   "loadingTokens": {
     "message": "トークンをロード中..."
   },
-  "login": {
+  "unlock": {
     "message": "ログイン"
   },
-  "logout": {
+  "lock": {
     "message": "ログアウト"
   },
   "mainnet": {
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
index 8f79e79666e8..61d7fe74b23b 100644
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "ಗುಣಲಕ್ಷಣಗಳು"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "ಸ್ವಯಂ-ಲಾಗ್ಔಟ್‌ ಟೈಮರ್ (ನಿಮಿಷಗಳು)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "MetaMask ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಲಾಗ್ ಔಟ್‌ ಆಗುವ ಮೊದಲು ನಿಮಿಷಗಳಲ್ಲಿ ನಿಷ್ಕ್ರಿಯ ಸಮಯವನ್ನು ಹೊಂದಿಸಿ"
   },
   "average": {
@@ -651,10 +651,7 @@
   "localhost": {
     "message": "ಲೋಕಲ್‌ಹೋಸ್ಟ್ 8545"
   },
-  "login": {
-    "message": "ಲಾಗ್ ಇನ್"
-  },
-  "logout": {
+  "lock": {
     "message": "ಲಾಗ್ ಔಟ್"
   },
   "mainnet": {
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 3c99005b845f..346b7f4e3107 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "속성"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "자동 로그아웃 타이머 (분)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "MetaMask가 자동으로 로그아웃되기 전 유휴 시간을 분 단위로 설정하세요"
   },
   "average": {
@@ -645,10 +645,7 @@
   "localhost": {
     "message": "로컬호스트 8545"
   },
-  "login": {
-    "message": "로그인"
-  },
-  "logout": {
+  "lock": {
     "message": "로그아웃"
   },
   "mainnet": {
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
index 7c800d81a1b5..a89974bcc33b 100644
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Požymiai"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Automatinio atjungimo laikmatis (minutės)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Nustatykite laukimo  trukmę minutėmis iki „MetaMask“ automatinio atsijungimo"
   },
   "average": {
@@ -651,10 +651,7 @@
   "localhost": {
     "message": "Vietinis serveris 8545"
   },
-  "login": {
-    "message": "Prisijungti"
-  },
-  "logout": {
+  "lock": {
     "message": "Atsijungti"
   },
   "mainnet": {
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
index 303774c355f6..98a61ee46ad9 100644
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Atribūti"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Automātiskās izrakstīšanās taimeris (minūtes)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Iestatiet bezdarbības laiku minūtēs, pēc kura MetaMask veiks automātisku izrakstīšanu"
   },
   "average": {
@@ -647,10 +647,7 @@
   "localhost": {
     "message": "Resursdators 8545"
   },
-  "login": {
-    "message": "Pierakstīties"
-  },
-  "logout": {
+  "lock": {
     "message": "Izrakstīties"
   },
   "mainnet": {
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
index 172009ec0030..aaf4cca590c7 100644
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Atribusi"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Pemasa Logout Automatik (minit)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Tetapkan masa melahu dalam minit sebelum MetaMask log keluar secara automatik"
   },
   "average": {
@@ -628,10 +628,7 @@
   "loadMore": {
     "message": "Muat Lagi"
   },
-  "login": {
-    "message": "Log Masuk"
-  },
-  "logout": {
+  "lock": {
     "message": "Log keluar"
   },
   "mainnet": {
diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json
index 8c5032ad3fac..6da9261cf0b4 100644
--- a/app/_locales/nl/messages.json
+++ b/app/_locales/nl/messages.json
@@ -239,10 +239,10 @@
   "loadingTokens": {
     "message": "Tokens laden ..."
   },
-  "login": {
+  "unlock": {
     "message": "Log in"
   },
-  "logout": {
+  "lock": {
     "message": "Uitloggen"
   },
   "mainnet": {
diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
index a1ec7e1197e0..5102c3c9711d 100644
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Henvisninger"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Timer for automatisk utlogging (minutter) "
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Innstill hviletiden i minutter før MetaMask automatisk logger ut"
   },
   "average": {
@@ -641,10 +641,7 @@
   "localhost": {
     "message": "Lokalvert 8545"
   },
-  "login": {
-    "message": "Logg inn"
-  },
-  "logout": {
+  "lock": {
     "message": "Logg ut "
   },
   "mainnet": {
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index b53b4ebb0af0..6e08f31aa345 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Atrybuty"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Czas automatycznego wylogowania (w minutach)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Ustaw czas bezczynności w minutach, po którym MetaMask wyloguje Cię automatycznie"
   },
   "average": {
@@ -648,10 +648,7 @@
   "localhost": {
     "message": "Serwer lokalny 8545"
   },
-  "login": {
-    "message": "Zaloguj się"
-  },
-  "logout": {
+  "lock": {
     "message": "Wyloguj się"
   },
   "mainnet": {
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 47439021b801..189225fc4a37 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -245,10 +245,10 @@
   "loadingTokens": {
     "message": "A carregar Tokens..."
   },
-  "login": {
+  "unlock": {
     "message": "Entrar"
   },
-  "logout": {
+  "lock": {
     "message": "Sair"
   },
   "mainnet": {
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index 1f32af89ca26..52a711bd30c8 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Atribuições"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Temporizador de Logout Automático (minutos)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Defina o tempo de inatividade em minutos antes de o MetaMask fazer logout automaticamente"
   },
   "average": {
@@ -639,10 +639,7 @@
   "loadMore": {
     "message": "Carregar Mais"
   },
-  "login": {
-    "message": "Entrar"
-  },
-  "logout": {
+  "lock": {
     "message": "Sair"
   },
   "mainnet": {
diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
index bad3f62935c9..aeb986ecb9d2 100644
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Atribuții"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Temporizator deconectare automată (minute)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Setați perioada de inactivitate în minute înainte ca MetaMask să se deconecteze automat"
   },
   "average": {
@@ -638,10 +638,7 @@
   "loadMore": {
     "message": "Încărcați mai multe"
   },
-  "login": {
-    "message": "Autentificare"
-  },
-  "logout": {
+  "lock": {
     "message": "Deconectați-vă"
   },
   "mainnet": {
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 2f1302d43d99..9d819c29bac1 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -281,10 +281,7 @@
   "loadingTokens": {
     "message": "Загрузка токенов..."
   },
-  "login": {
-    "message": "Вход"
-  },
-  "logout": {
+  "lock": {
     "message": "Выход"
   },
   "mainnet": {
@@ -593,10 +590,10 @@
   "attemptToCancelDescription": {
     "message": "Отправка этой попытки не гарантирует отмену вашей первоначальной транзакции. Если попытка отмены окажется успешной комиссия за исходную транзакцию будет возвращена."
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Таймер автоматического выхода из кошелька (минуты)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Установите время простоя в минутах, прежде чем MetaMask автоматически заблокирует кошелек"
   },
   "average": {
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index 665d9757447a..7132570bdbbd 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -106,10 +106,10 @@
   "attributions": {
     "message": "Zásluhy"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Časovač automatického odhlásenia (minúty)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Nastavte čas nečinnosti v minútach skôr, než sa MetaMask automaticky odhlási"
   },
   "average": {
@@ -626,10 +626,7 @@
   "loadMore": {
     "message": "Načítať viac"
   },
-  "login": {
-    "message": "Přihlásit"
-  },
-  "logout": {
+  "lock": {
     "message": "Odhlásit"
   },
   "memorizePhrase": {
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index b1e9e4dd8297..2dbeb1046440 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Dodelitve"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Časovnik za samodejno odjavo (minute)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Nastavite, po koliko minutah mirovanja naj se MetaMask samodejno odjavi"
   },
   "average": {
@@ -636,10 +636,7 @@
   "loadMore": {
     "message": "Naloži več"
   },
-  "login": {
-    "message": "Prijava"
-  },
-  "logout": {
+  "lock": {
     "message": "Odjava"
   },
   "mainnet": {
diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
index 4d72762d03c3..3b359584c02c 100644
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Atribucije"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Tajmer za automatsko odjavljivanje (u minutama)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Podesite vreme mirovanja u minutima pre nego što se MetaMask automatski odjavi. "
   },
   "average": {
@@ -645,10 +645,7 @@
   "loadMore": {
     "message": "Učitati više"
   },
-  "login": {
-    "message": "Ulogujte se"
-  },
-  "logout": {
+  "lock": {
     "message": "Odjavi se"
   },
   "mainnet": {
diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json
index 4f7f5e738214..25e339128a77 100644
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Tillskrivningar"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Timer för automatisk utloggning (minuter)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Ställ in efter hur lång tids inaktivitet som MetaMask automatiskt loggar ut"
   },
   "average": {
@@ -638,10 +638,7 @@
   "loadMore": {
     "message": "Ladda mer"
   },
-  "login": {
-    "message": "Logga in"
-  },
-  "logout": {
+  "lock": {
     "message": "Logga ut"
   },
   "mainnet": {
diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json
index 2ab4f52a521e..3326b7c7aee1 100644
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Sifa"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Kihesabu Muda wa Kuondoka Kwenye Akaunti Kiotomatiki (dakika)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Weka muda katika dakika kabla MetaMask haijaondoa kwenye akaunti kiotomatiki."
   },
   "average": {
@@ -632,10 +632,7 @@
   "loadMore": {
     "message": "Pak zAIDI"
   },
-  "login": {
-    "message": "Ingia kwenye akanuti"
-  },
-  "logout": {
+  "lock": {
     "message": "Toka kwenye akaunti"
   },
   "mainnet": {
diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json
index ab4a2d99632b..75ef08a57e25 100644
--- a/app/_locales/ta/messages.json
+++ b/app/_locales/ta/messages.json
@@ -278,10 +278,7 @@
   "localhost": {
     "message": "லோக்கல் ஹோஸ்ட் 8545"
   },
-  "login": {
-    "message": "உள் நுழை"
-  },
-  "logout": {
+  "lock": {
     "message": "வெளியேறு"
   },
   "mainnet": {
diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json
index 01cc020f00d9..61bc3e5f761c 100644
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@@ -329,10 +329,7 @@
   "loadingTokens": {
     "message": "กำลังโหลดโทเค็น..."
   },
-  "login": {
-    "message": "เข้าสู่ระบบ"
-  },
-  "logout": {
+  "lock": {
     "message": "ออกจากระบบ"
   },
   "mainnet": {
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index f21f35be810e..6aac9538735f 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -281,10 +281,10 @@
   "loadingTokens": {
     "message": "Jetonlar yükleniyor..."
   },
-  "login": {
+  "unlock": {
     "message": "Giriş yap"
   },
-  "logout": {
+  "lock": {
     "message": "Çıkış"
   },
   "mainnet": {
diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json
index 0b85aa9c559c..648dc7e704e3 100644
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "Авторство"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "Таймер автоматичного виходу (хвилин)"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "Встановіть час відсутності активності у хвилинах після якого MetaMask буде здійснювати автоматичний вихід"
   },
   "average": {
@@ -651,10 +651,7 @@
   "localhost": {
     "message": "Локальний хост 8545"
   },
-  "login": {
-    "message": "Увійти"
-  },
-  "logout": {
+  "lock": {
     "message": "Вийти"
   },
   "mainnet": {
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index cf668f1615d7..a2e9d7c60ee3 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -200,7 +200,7 @@
   "loadingTokens": {
     "message": "Đang tải mã token..."
   },
-  "logout": {
+  "lock": {
     "message": "Thoát"
   },
   "mainnet": {
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 6fcdaee5d4b0..81ee84ab8e6b 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "来源"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "自动注销计时器（分钟）"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "请设置 ConfluxPortal 自动注销前的空闲时间（以分钟为单位）"
   },
   "average": {
@@ -642,11 +642,8 @@
   "loadMore": {
     "message": "加载更多"
   },
-  "login": {
-    "message": "登录"
-  },
-  "logout": {
-    "message": "登出"
+  "lock": {
+    "message": "锁定"
   },
   "mainnet": {
     "message": "Conflux 主网 (未上线, 选择后依然连接测试网)"
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index a480a80ec6ea..d83a36632232 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -109,10 +109,10 @@
   "attributions": {
     "message": "來源"
   },
-  "autoLogoutTimeLimit": {
+  "autoLockTimeLimit": {
     "message": "自動登出計時器（分）"
   },
-  "autoLogoutTimeLimitDescription": {
+  "autoLockTimeLimitDescription": {
     "message": "設定閒置分鐘上限，時間到時 ConfluxPortal 將自動登出"
   },
   "average": {
@@ -648,11 +648,8 @@
   "loadMore": {
     "message": "載入更多"
   },
-  "login": {
-    "message": "登入"
-  },
-  "logout": {
-    "message": "登出"
+  "lock": {
+    "message": "鎖定"
   },
   "mainnet": {
     "message": "Conflux 主網 (未上線, 選擇後依然連接測試網)"
@@ -1269,6 +1266,9 @@
   "unknownCameraError": {
     "message": "無法存取攝影鏡頭。請再試一次..."
   },
+  "unlock": {
+    "message": "解鎖"
+  },
   "unlockMessage": {
     "message": "去中心化網路世界等待著您"
   },
diff --git a/app/scripts/controllers/app-state.js b/app/scripts/controllers/app-state.js
index c5e35fcbbc5a..82efe54165ba 100644
--- a/app/scripts/controllers/app-state.js
+++ b/app/scripts/controllers/app-state.js
@@ -22,10 +22,10 @@ class AppStateController {
     this.timer = null
 
     preferencesStore.subscribe(state => {
-      this._setInactiveTimeout(state.preferences.autoLogoutTimeLimit)
+      this._setInactiveTimeout(state.preferences.autoLockTimeLimit)
     })
 
-    this._setInactiveTimeout(preferences.autoLogoutTimeLimit)
+    this._setInactiveTimeout(preferences.autoLockTimeLimit)
   }
 
   setMkrMigrationReminderTimestamp (timestamp) {
diff --git a/app/scripts/migrations/041.js b/app/scripts/migrations/041.js
new file mode 100644
index 000000000000..a4b640a3da5b
--- /dev/null
+++ b/app/scripts/migrations/041.js
@@ -0,0 +1,25 @@
+const version = 41
+import clone from 'clone'
+
+/**
+ * PreferencesController.autoLogoutTimeLimit -> autoLockTimeLimit
+ */
+export default {
+  version,
+  migrate: async function (originalVersionedData) {
+    const versionedData = clone(originalVersionedData)
+    versionedData.meta.version = version
+    const state = versionedData.data
+    versionedData.data = transformState(state)
+    return versionedData
+  },
+}
+
+function transformState (state) {
+  if (state.PreferencesController && state.PreferencesController.preferences) {
+    state.PreferencesController.preferences.autoLockTimeLimit =
+      state.PreferencesController.preferences.autoLogoutTimeLimit
+    delete state.PreferencesController.preferences.autoLogoutTimeLimit
+  }
+  return state
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index 959af961ac32..4a6c56cc7eb0 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -51,6 +51,7 @@ const migrations = [
   require('./038').default,
   require('./039').default,
   require('./040').default,
+  require('./041').default,
 ]
 
 export default migrations
diff --git a/test/e2e/address-book.spec.js b/test/e2e/address-book.spec.js
index ba8887cad64e..6a526edd9ca2 100644
--- a/test/e2e/address-book.spec.js
+++ b/test/e2e/address-book.spec.js
@@ -155,11 +155,11 @@ describe('MetaMask', function () {
       await driver.clickElement(By.css('.account-menu__icon'))
       await driver.delay(regularDelayMs)
 
-      const logoutButton = await driver.findClickableElement(
-        By.css('.account-menu__logout-button')
+      const lockButton = await driver.findClickableElement(
+        By.css('.account-menu__lock-button')
       )
-      assert.equal(await logoutButton.getText(), 'Log out')
-      await logoutButton.click()
+      assert.equal(await lockButton.getText(), 'Lock')
+      await lockButton.click()
       await driver.delay(regularDelayMs)
     })
 
diff --git a/test/e2e/from-import-ui.spec.js b/test/e2e/from-import-ui.spec.js
index 26fac9171787..9710b294ac4d 100644
--- a/test/e2e/from-import-ui.spec.js
+++ b/test/e2e/from-import-ui.spec.js
@@ -143,16 +143,16 @@ describe('Using MetaMask with an existing account', function () {
     })
   })
 
-  describe('Log out and log back in', () => {
+  describe('Lock and unlock', () => {
     it('logs out of the account', async () => {
       await driver.clickElement(By.css('.account-menu__icon .identicon'))
       await driver.delay(regularDelayMs)
 
-      const logoutButton = await driver.findClickableElement(
-        By.css('.account-menu__logout-button')
+      const lockButton = await driver.findClickableElement(
+        By.css('.account-menu__lock-button')
       )
-      assert.equal(await logoutButton.getText(), 'Log out')
-      await logoutButton.click()
+      assert.equal(await lockButton.getText(), 'Lock')
+      await lockButton.click()
       await driver.delay(regularDelayMs)
     })
 
diff --git a/test/e2e/metamask-responsive-ui.spec.js b/test/e2e/metamask-responsive-ui.spec.js
index d01d9b6e28be..8993daae3ee8 100644
--- a/test/e2e/metamask-responsive-ui.spec.js
+++ b/test/e2e/metamask-responsive-ui.spec.js
@@ -160,11 +160,11 @@ describe('MetaMask', function () {
       await driver.clickElement(By.css('.account-menu__icon'))
       await driver.delay(regularDelayMs)
 
-      const logoutButton = await driver.findClickableElement(
-        By.css('.account-menu__logout-button')
+      const lockButton = await driver.findClickableElement(
+        By.css('.account-menu__lock-button')
       )
-      assert.equal(await logoutButton.getText(), 'Log out')
-      await logoutButton.click()
+      assert.equal(await lockButton.getText(), 'Lock')
+      await lockButton.click()
       await driver.delay(regularDelayMs)
     })
 
diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js
index 30271b8dc88f..43ed035fb470 100644
--- a/test/e2e/metamask-ui.spec.js
+++ b/test/e2e/metamask-ui.spec.js
@@ -168,16 +168,16 @@ describe('MetaMask', function () {
     })
   })
 
-  describe('Log out an log back in', () => {
+  describe('Lock an unlock', () => {
     it('logs out of the account', async () => {
       await driver.clickElement(By.css('.account-menu__icon'))
       await driver.delay(regularDelayMs)
 
-      const logoutButton = await driver.findClickableElement(
-        By.css('.account-menu__logout-button')
+      const lockButton = await driver.findClickableElement(
+        By.css('.account-menu__lock-button')
       )
-      assert.equal(await logoutButton.getText(), 'Log out')
-      await logoutButton.click()
+      assert.equal(await lockButton.getText(), 'Lock')
+      await lockButton.click()
       await driver.delay(regularDelayMs)
     })
 
@@ -227,11 +227,11 @@ describe('MetaMask', function () {
       await driver.clickElement(By.css('.account-menu__icon'))
       await driver.delay(regularDelayMs)
 
-      const logoutButton = await driver.findClickableElement(
-        By.css('.account-menu__logout-button')
+      const lockButton = await driver.findClickableElement(
+        By.css('.account-menu__lock-button')
       )
-      assert.equal(await logoutButton.getText(), 'Log out')
-      await logoutButton.click()
+      assert.equal(await lockButton.getText(), 'Lock')
+      await lockButton.click()
       await driver.delay(regularDelayMs)
     })
 
diff --git a/ui/app/components/app/account-menu/account-menu.component.js b/ui/app/components/app/account-menu/account-menu.component.js
index 87331fa31516..cea59fb807b1 100644
--- a/ui/app/components/app/account-menu/account-menu.component.js
+++ b/ui/app/components/app/account-menu/account-menu.component.js
@@ -311,13 +311,13 @@ export default class AccountMenu extends Component {
         <Item className="account-menu__header">
           {t('myAccounts')}
           <button
-            className="account-menu__logout-button"
+            className="account-menu__lock-button"
             onClick={() => {
               lockMetamask()
               history.push(DEFAULT_ROUTE)
             }}
           >
-            {t('logout')}
+            {t('lock')}
           </button>
         </Item>
         <Divider />
diff --git a/ui/app/components/app/account-menu/index.scss b/ui/app/components/app/account-menu/index.scss
index c8385b5e79f2..f81ce278e610 100644
--- a/ui/app/components/app/account-menu/index.scss
+++ b/ui/app/components/app/account-menu/index.scss
@@ -36,7 +36,7 @@
     align-items: center;
   }
 
-  &__logout-button {
+  &__lock-button {
     border: 1px solid $dusty-gray;
     background-color: transparent;
     color: $white;
diff --git a/ui/app/pages/routes/index.js b/ui/app/pages/routes/index.js
index fa72f784b669..2ae1beb3420e 100644
--- a/ui/app/pages/routes/index.js
+++ b/ui/app/pages/routes/index.js
@@ -137,7 +137,7 @@ class Routes extends Component {
   }
 
   renderRoutes () {
-    const { autoLogoutTimeLimit, setLastActiveTime } = this.props
+    const { autoLockTimeLimit, setLastActiveTime } = this.props
 
     const routes = (
       <Switch>
@@ -195,7 +195,7 @@ class Routes extends Component {
       </Switch>
     )
 
-    if (autoLogoutTimeLimit > 0) {
+    if (autoLockTimeLimit > 0) {
       return (
         <IdleTimer onAction={setLastActiveTime} throttle={1000}>
           {routes}
@@ -443,7 +443,7 @@ Routes.propTypes = {
   setMouseUserState: PropTypes.func,
   providerId: PropTypes.string,
   hasPermissionsRequests: PropTypes.bool,
-  autoLogoutTimeLimit: PropTypes.number,
+  autoLockTimeLimit: PropTypes.number,
   addressConnectedToCurrentTab: PropTypes.string,
   showAccountDetail: PropTypes.func,
 }
@@ -462,7 +462,7 @@ function mapStateToProps (state) {
     loadingMessage,
   } = appState
 
-  const { autoLogoutTimeLimit = 0 } = preferencesSelector(state)
+  const { autoLockTimeLimit = 0 } = preferencesSelector(state)
 
   return {
     // state from plugin
@@ -481,7 +481,7 @@ function mapStateToProps (state) {
     currentCurrency: state.metamask.currentCurrency,
     isMouseUser: state.appState.isMouseUser,
     providerId: getNetworkIdentifier(state),
-    autoLogoutTimeLimit,
+    autoLockTimeLimit,
     hasPermissionsRequests: hasPermissionRequests(state),
     addressConnectedToCurrentTab: getAddressConnectedToCurrentTab(state),
   }
diff --git a/ui/app/pages/settings/advanced-tab/advanced-tab.component.js b/ui/app/pages/settings/advanced-tab/advanced-tab.component.js
index d80b2d8a7081..6b46f369f3d1 100644
--- a/ui/app/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/app/pages/settings/advanced-tab/advanced-tab.component.js
@@ -25,8 +25,8 @@ export default class AdvancedTab extends PureComponent {
     setAdvancedInlineGasFeatureFlag: PropTypes.func,
     advancedInlineGas: PropTypes.bool,
     showFiatInTestnets: PropTypes.bool,
-    autoLogoutTimeLimit: PropTypes.number,
-    setAutoLogoutTimeLimit: PropTypes.func.isRequired,
+    autoLockTimeLimit: PropTypes.number,
+    setAutoLockTimeLimit: PropTypes.func.isRequired,
     setShowFiatConversionOnTestnetsPreference: PropTypes.func.isRequired,
     threeBoxSyncingAllowed: PropTypes.bool.isRequired,
     setThreeBoxSyncingPermission: PropTypes.func.isRequired,
@@ -36,8 +36,8 @@ export default class AdvancedTab extends PureComponent {
   }
 
   state = {
-    autoLogoutTimeLimit: this.props.autoLogoutTimeLimit,
-    logoutTimeError: '',
+    autoLockTimeLimit: this.props.autoLockTimeLimit,
+    lockTimeError: '',
     ipfsGateway: this.props.ipfsGateway,
     ipfsGatewayError: '',
   }
@@ -272,38 +272,38 @@ export default class AdvancedTab extends PureComponent {
     )
   }
 
-  handleLogoutChange (time) {
+  handleLockChange (time) {
     const { t } = this.context
-    const autoLogoutTimeLimit = Math.max(Number(time), 0)
+    const autoLockTimeLimit = Math.max(Number(time), 0)
 
     this.setState(() => {
-      let logoutTimeError = ''
+      let lockTimeError = ''
 
-      if (autoLogoutTimeLimit > 10080) {
-        logoutTimeError = t('logoutTimeTooGreat')
+      if (autoLockTimeLimit > 10080) {
+        lockTimeError = t('lockTimeTooGreat')
       }
 
       return {
-        autoLogoutTimeLimit,
-        logoutTimeError,
+        autoLockTimeLimit,
+        lockTimeError,
       }
     })
   }
 
-  renderAutoLogoutTimeLimit () {
+  renderAutoLockTimeLimit () {
     const { t } = this.context
-    const { logoutTimeError } = this.state
-    const { autoLogoutTimeLimit, setAutoLogoutTimeLimit } = this.props
+    const { lockTimeError } = this.state
+    const { autoLockTimeLimit, setAutoLockTimeLimit } = this.props
 
     return (
       <div
         className="settings-page__content-row"
-        data-testid="advanced-setting-auto-logout"
+        data-testid="advanced-setting-auto-lock"
       >
         <div className="settings-page__content-item">
-          <span>{t('autoLogoutTimeLimit')}</span>
+          <span>{t('autoLockTimeLimit')}</span>
           <div className="settings-page__content-description">
-            {t('autoLogoutTimeLimitDescription')}
+            {t('autoLockTimeLimitDescription')}
           </div>
         </div>
         <div className="settings-page__content-item">
@@ -312,10 +312,10 @@ export default class AdvancedTab extends PureComponent {
               type="number"
               id="autoTimeout"
               placeholder="5"
-              value={this.state.autoLogoutTimeLimit}
-              defaultValue={autoLogoutTimeLimit}
-              onChange={e => this.handleLogoutChange(e.target.value)}
-              error={logoutTimeError}
+              value={this.state.autoLockTimeLimit}
+              defaultValue={autoLockTimeLimit}
+              onChange={e => this.handleLockChange(e.target.value)}
+              error={lockTimeError}
               fullWidth
               margin="dense"
               min={0}
@@ -323,9 +323,9 @@ export default class AdvancedTab extends PureComponent {
             <Button
               type="primary"
               className="settings-tab__rpc-save-button"
-              disabled={logoutTimeError !== ''}
+              disabled={lockTimeError !== ''}
               onClick={() => {
-                setAutoLogoutTimeLimit(this.state.autoLogoutTimeLimit)
+                setAutoLockTimeLimit(this.state.autoLockTimeLimit)
               }}
             >
               {t('save')}
@@ -475,7 +475,7 @@ export default class AdvancedTab extends PureComponent {
         {this.renderHexDataOptIn()}
         {this.renderShowConversionInTestnets()}
         {this.renderUseNonceOptIn()}
-        {this.renderAutoLogoutTimeLimit()}
+        {this.renderAutoLockTimeLimit()}
         {/* {this.renderThreeBoxControl()} */}
         {/* {this.renderIpfsGatewayControl()} */}
       </div>
diff --git a/ui/app/pages/settings/advanced-tab/advanced-tab.container.js b/ui/app/pages/settings/advanced-tab/advanced-tab.container.js
index 67e26aa7fa34..742c5825aa89 100644
--- a/ui/app/pages/settings/advanced-tab/advanced-tab.container.js
+++ b/ui/app/pages/settings/advanced-tab/advanced-tab.container.js
@@ -7,7 +7,7 @@ import {
   setFeatureFlag,
   showModal,
   setShowFiatConversionOnTestnetsPreference,
-  setAutoLogoutTimeLimit,
+  setAutoLockTimeLimit,
   setThreeBoxSyncingPermission,
   turnThreeBoxSyncingOnAndInitialize,
   setUseNonceField,
@@ -27,14 +27,14 @@ export const mapStateToProps = state => {
     useNonceField,
     ipfsGateway,
   } = metamask
-  const { showFiatInTestnets, autoLogoutTimeLimit } = preferencesSelector(state)
+  const { showFiatInTestnets, autoLockTimeLimit } = preferencesSelector(state)
 
   return {
     warning,
     sendHexData,
     advancedInlineGas,
     showFiatInTestnets,
-    autoLogoutTimeLimit,
+    autoLockTimeLimit,
     threeBoxSyncingAllowed,
     threeBoxDisabled,
     useNonceField,
@@ -55,8 +55,8 @@ export const mapDispatchToProps = dispatch => {
     setShowFiatConversionOnTestnetsPreference: value => {
       return dispatch(setShowFiatConversionOnTestnetsPreference(value))
     },
-    setAutoLogoutTimeLimit: value => {
-      return dispatch(setAutoLogoutTimeLimit(value))
+    setAutoLockTimeLimit: value => {
+      return dispatch(setAutoLockTimeLimit(value))
     },
     setThreeBoxSyncingPermission: newThreeBoxSyncingState => {
       if (newThreeBoxSyncingState) {
diff --git a/ui/app/pages/settings/advanced-tab/tests/advanced-tab-component.test.js b/ui/app/pages/settings/advanced-tab/tests/advanced-tab-component.test.js
index 63d1eff7c24a..d45a0deab9ed 100644
--- a/ui/app/pages/settings/advanced-tab/tests/advanced-tab-component.test.js
+++ b/ui/app/pages/settings/advanced-tab/tests/advanced-tab-component.test.js
@@ -10,7 +10,7 @@ describe('AdvancedTab Component', () => {
     const root = shallow(
       <AdvancedTab
         ipfsGateway=""
-        setAutoLogoutTimeLimit={() => {}}
+        setAutoLockTimeLimit={() => {}}
         setIpfsGateway={() => {}}
         setShowFiatConversionOnTestnetsPreference={() => {}}
         setThreeBoxSyncingPermission={() => {}}
@@ -27,12 +27,12 @@ describe('AdvancedTab Component', () => {
     assert.equal(root.find('.settings-page__content-row').length, 7)
   })
 
-  it('should update autoLogoutTimeLimit', () => {
-    const setAutoLogoutTimeLimitSpy = sinon.spy()
+  it('should update autoLockTimeLimit', () => {
+    const setAutoLockTimeLimitSpy = sinon.spy()
     const root = shallow(
       <AdvancedTab
         ipfsGateway=""
-        setAutoLogoutTimeLimit={setAutoLogoutTimeLimitSpy}
+        setAutoLockTimeLimit={setAutoLockTimeLimitSpy}
         setIpfsGateway={() => {}}
         setShowFiatConversionOnTestnetsPreference={() => {}}
         setThreeBoxSyncingPermission={() => {}}
@@ -50,9 +50,9 @@ describe('AdvancedTab Component', () => {
     const textField = autoTimeout.find(TextField)
 
     textField.props().onChange({ target: { value: 1440 } })
-    assert.equal(root.state().autoLogoutTimeLimit, 1440)
+    assert.equal(root.state().autoLockTimeLimit, 1440)
 
     autoTimeout.find('.settings-tab__rpc-save-button').simulate('click')
-    assert.equal(setAutoLogoutTimeLimitSpy.args[0][0], 1440)
+    assert.equal(setAutoLockTimeLimitSpy.args[0][0], 1440)
   })
 })
diff --git a/ui/app/pages/unlock-page/unlock-page.component.js b/ui/app/pages/unlock-page/unlock-page.component.js
index 3053250c7e6a..993c42d0e557 100644
--- a/ui/app/pages/unlock-page/unlock-page.component.js
+++ b/ui/app/pages/unlock-page/unlock-page.component.js
@@ -128,7 +128,7 @@ export default class UnlockPage extends Component {
         onClick={this.handleSubmit}
         disableRipple
       >
-        {this.context.t('login')}
+        {this.context.t('unlock')}
       </Button>
     )
   }
diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js
index 6d9164480bfe..2f953e682334 100644
--- a/ui/app/store/actions.js
+++ b/ui/app/store/actions.js
@@ -2032,8 +2032,8 @@ export function setShowFiatConversionOnTestnetsPreference (value) {
   return setPreference('showFiatInTestnets', value)
 }
 
-export function setAutoLogoutTimeLimit (value) {
-  return setPreference('autoLogoutTimeLimit', value)
+export function setAutoLockTimeLimit (value) {
+  return setPreference('autoLockTimeLimit', value)
 }
 
 export function setCompletedOnboarding () {