diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php
index 6f068b222..dd28828ec 100644
--- a/web/inc/i18n/ar.php
+++ b/web/inc/i18n/ar.php
@@ -748,12 +748,13 @@ $LANG['ar'] = array(
     'Use server hostname' => 'استخدم اسم السيرفر',
     'Use domain hostname' => 'استخدم اسم الدومين',
     'Use STARTTLS' => 'استخدم STARTTLS',
-    'Use SSL' => 'استخدم SSL',
+    'Use SSL / TLS' => 'استخدم SSL / TLS',
     'No encryption' => 'بلا تشفير',
     'Do not use encryption' => 'لا تستخدم التشفير',
 
     'maximum characters length, including prefix' => 'الحد الأقصى لعدد الحروف هو %s يشمل البادئة',
 
+    'Email Credentials' => 'Email Credentials',
 
 // Texts below doesn't exist in en.php
     '%s rule' => 'قواعد %s',
diff --git a/web/inc/i18n/bg.php b/web/inc/i18n/bg.php
index b03cf2dfc..760b88c17 100644
--- a/web/inc/i18n/bg.php
+++ b/web/inc/i18n/bg.php
@@ -742,11 +742,12 @@ $LANG['bg'] = array(
     'Use server hostname' => 'Използвай сървърното хост име',
     'Use domain hostname' => 'Използвай хост името на домейн',
     'Use STARTTLS' => 'Използвай STARTTLS',
-    'Use SSL' => 'Използвай SSL',
+    'Use SSL / TLS' => 'Използвай SSL / TLS',
     'No encryption' => 'Без криптиране',
     'Do not use encryption' => 'Не използвай криптиране',
 
     'maximum characters length, including prefix' => 'максималната дължина е %s символа, включително префикса',
 
+    'Email Credentials' => 'Email Credentials',
 );
 
diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php
index 05a930839..22d997e59 100644
--- a/web/inc/i18n/bs.php
+++ b/web/inc/i18n/bs.php
@@ -747,10 +747,11 @@ $LANG['bs'] = array(
     'Use server hostname' => 'Koristi server hostname',
     'Use domain hostname' => 'Koristi hostname domena',
     'Use STARTTLS' => 'Koristi STARTTLS',
-    'Use SSL' => 'Koristi SSL',
+    'Use SSL / TLS' => 'Koristi SSL / TLS',
     'No encryption' => 'Bez enkripcije',
     'Do not use encryption' => 'Nemoj koristiti enkripciju',
 
     'maximum characters length, including prefix' => 'maksimalna dužina sme biti %s karaktera, uključujući i prefix',
 
+    'Email Credentials' => 'Email lozinka i podešavanja',
 );
diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php
index c5216082f..86733ab19 100644
--- a/web/inc/i18n/cn.php
+++ b/web/inc/i18n/cn.php
@@ -750,10 +750,11 @@ $LANG['cn'] = array(
     'Use server hostname' => '采用服务器主机名',
     'Use domain hostname' => '采用域名',
     'Use STARTTLS' => '采用 STARTTLS 加密',
-    'Use SSL' => '采用 SSL 加密',
+    'Use SSL / TLS' => '采用 SSL / TLS 加密',
     'No encryption' => '不加密',
     'Do not use encryption' => '不要使用加密',
 
     'maximum characters length, including prefix' => '最多 %s 个字符，包含前缀',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php
index 8502e460f..f9f291bfd 100644
--- a/web/inc/i18n/cz.php
+++ b/web/inc/i18n/cz.php
@@ -748,10 +748,11 @@ $LANG['cz'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php
index 705f5a5e6..80e78a355 100644
--- a/web/inc/i18n/da.php
+++ b/web/inc/i18n/da.php
@@ -749,10 +749,11 @@ $LANG['da'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php
index 9de743070..04d538d54 100644
--- a/web/inc/i18n/de.php
+++ b/web/inc/i18n/de.php
@@ -747,10 +747,11 @@ $LANG['de'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php
index 7af6d1ec4..7e1935233 100644
--- a/web/inc/i18n/el.php
+++ b/web/inc/i18n/el.php
@@ -749,10 +749,11 @@ $LANG['el'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php
index a02ad7cc1..ed5c1f2e7 100644
--- a/web/inc/i18n/en.php
+++ b/web/inc/i18n/en.php
@@ -747,10 +747,12 @@ $LANG['en'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
+
 );
diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php
index 6f66ff650..d9b9f5fbe 100644
--- a/web/inc/i18n/es.php
+++ b/web/inc/i18n/es.php
@@ -754,10 +754,11 @@ $LANG['es'] = array(
     'Use server hostname' => 'Usar hostname del servidor',
     'Use domain hostname' => 'Usar hostname del dominio',
     'Use STARTTLS' => 'Usar STARTTLS',
-    'Use SSL' => 'Usar SSL',
+    'Use SSL / TLS' => 'Usar SSL / TLS',
     'No encryption' => 'Sin encriptación',
     'Do not use encryption' => 'No usar encriptación',
 
     'maximum characters length, including prefix' => 'usar un máximo de %s caracteres, incluyendo prefijo',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php
index 87aeaadea..878a4b691 100644
--- a/web/inc/i18n/fa.php
+++ b/web/inc/i18n/fa.php
@@ -720,8 +720,9 @@ $LANG['fa'] = array(
     'Use server hostname' => 'استفاده از نام سرور میزبان',
     'Use domain hostname' => 'استفاده از نام دامنه میزبان',
     'Use STARTTLS' => 'استفاده از STARTTLS',
-    'Use SSL' => 'استفاده از SSL',
+    'Use SSL / TLS' => 'استفاده از SSL / TLS',
     'No encryption' => 'بدون رمزگذاری',
     'Do not use encryption' => 'از رمزگذاری استفاده نشود',
     'maximum characters length, including prefix' => 'بیشینه %s کاراکتر طول, شامل پیشوند',
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php
index ba858ac0e..aff1375b8 100644
--- a/web/inc/i18n/fi.php
+++ b/web/inc/i18n/fi.php
@@ -749,12 +749,13 @@ $LANG['fi'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 
 // Texts below doesn't exist in en.php
     'traffic' => 'tiedonsiirto',
diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php
index 3c412000e..c57e6266f 100644
--- a/web/inc/i18n/fr.php
+++ b/web/inc/i18n/fr.php
@@ -747,12 +747,14 @@ $LANG['fr'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
+
 
 // Texts below doesn't exist in en.php
     'disk' => 'disque',
diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php
index 1dc9c314c..af461107d 100644
--- a/web/inc/i18n/hu.php
+++ b/web/inc/i18n/hu.php
@@ -751,10 +751,11 @@ $LANG['hu'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php
index b90f638b8..ad3c18eb1 100644
--- a/web/inc/i18n/id.php
+++ b/web/inc/i18n/id.php
@@ -750,10 +750,11 @@ $LANG['id'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php
index 204b6c6fc..ec7a83d50 100644
--- a/web/inc/i18n/it.php
+++ b/web/inc/i18n/it.php
@@ -748,10 +748,11 @@ $LANG['it'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php
index 4d013bad8..f2836948e 100644
--- a/web/inc/i18n/ja.php
+++ b/web/inc/i18n/ja.php
@@ -747,10 +747,11 @@ $LANG['ja'] = array(
     'Use server hostname' => 'サーバーのホスト名を使用する',
     'Use domain hostname' => 'ドメインのホスト名を使用する',
     'Use STARTTLS' => 'STARTTLSを使用する',
-    'Use SSL' => 'SSLを使用する',
+    'Use SSL / TLS' => 'SSL/TLSを使用する',
     'No encryption' => '暗号化しない',
     'Do not use encryption' => '暗号化を使用しない',
 
     'maximum characters length, including prefix' => '接頭辞込みで最大 %s 文字',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/ka.php b/web/inc/i18n/ka.php
index 2f3550816..0ebf2d116 100644
--- a/web/inc/i18n/ka.php
+++ b/web/inc/i18n/ka.php
@@ -747,10 +747,11 @@ $LANG['ka'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php
index 73623c40e..5b4eb19b5 100644
--- a/web/inc/i18n/nl.php
+++ b/web/inc/i18n/nl.php
@@ -750,9 +750,11 @@ $LANG['nl'] = array(
     'Use server hostname' => 'Gebruik server hostnaam',
     'Use domain hostname' => 'Gebruik domein hostname',
     'Use STARTTLS' => 'Gebruik STARTTLS',
-    'Use SSL' => 'Gebruik SSL',
+    'Use SSL / TLS' => 'Gebruik SSL / TLS',
     'No encryption' => 'Geen encryptie',
     'Do not use encryption' => 'Gebruik geen encryptie',
 
     'maximum characters length, including prefix' => 'maximaal %s karakters lang, inclusief prefix',
+
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php
index 3ae4818ea..45c23f228 100644
--- a/web/inc/i18n/no.php
+++ b/web/inc/i18n/no.php
@@ -748,10 +748,11 @@ $LANG['no'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php
index 9f82a63b4..23c8016cb 100644
--- a/web/inc/i18n/pl.php
+++ b/web/inc/i18n/pl.php
@@ -748,10 +748,11 @@ $LANG['pl'] = array(
     'Use server hostname' => 'Użyj hostname serwera',
     'Use domain hostname' => 'Użyj domeny serwera',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'Brak szyfrowania',
     'Do not use encryption' => 'Nie korzystaj z szyfrowania',
 
     'maximum characters length, including prefix' => 'maksymalna %s ilość znaków, łącznie z prefiksem',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/pt-BR.php b/web/inc/i18n/pt-BR.php
index deac82ee1..6a8c4884a 100644
--- a/web/inc/i18n/pt-BR.php
+++ b/web/inc/i18n/pt-BR.php
@@ -747,10 +747,11 @@ $LANG['pt-BR'] = array(
     'Use server hostname' => 'Usar hostname do servidor',
     'Use domain hostname' => 'Usar hostname do domínio',
     'Use STARTTLS' => 'Usar STARTTLS',
-    'Use SSL' => 'Usar SSL',
+    'Use SSL / TLS' => 'Usar SSL / TLS',
     'No encryption' => 'Nenhuma criptografia',
     'Do not use encryption' => 'Não usar criptografia',
 
     'maximum characters length, including prefix' => 'comprimento máximo de % caracteres, incluindo o prefixo',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php
index f72890768..ec1eb670d 100644
--- a/web/inc/i18n/pt.php
+++ b/web/inc/i18n/pt.php
@@ -747,10 +747,11 @@ $LANG['pt'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php
index 413e5866b..0a9e93e3d 100644
--- a/web/inc/i18n/ro.php
+++ b/web/inc/i18n/ro.php
@@ -749,10 +749,11 @@ $LANG['ro'] = array(
     'Use server hostname' => 'Utilizează nume de host server',
     'Use domain hostname' => 'Utilizează nume de host domeniu',
     'Use STARTTLS' => 'Utilizează STARTTLS',
-    'Use SSL' => 'Utilizează SSL',
+    'Use SSL / TLS' => 'Utilizează SSL / TLS',
     'No encryption' => 'Fără encriptare',
     'Do not use encryption' => 'Nu folosi encriptare',
 
     'maximum characters length, including prefix' => 'maximum %s caractere, incluzând prefixul',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php
index da88e88c5..22a9b6455 100644
--- a/web/inc/i18n/ru.php
+++ b/web/inc/i18n/ru.php
@@ -750,10 +750,11 @@ $LANG['ru'] = array(
     'Use server hostname' => 'Использовать серверное имя хоста',
     'Use domain hostname' => 'Использовать доменное имя хоста',
     'Use STARTTLS' => 'Использовать STARTTLS',
-    'Use SSL' => 'Использовать SSL',
+    'Use SSL / TLS' => 'Использовать SSL / TLS',
     'No encryption' => 'Без шифрования',
     'Do not use encryption' => 'Не использовать шифрование',
 
     'maximum characters length, including prefix' => 'максимальное %s количество символов, включая префикс',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php
index 538d2db95..87bb1910f 100644
--- a/web/inc/i18n/se.php
+++ b/web/inc/i18n/se.php
@@ -747,10 +747,11 @@ $LANG['se'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/th.php b/web/inc/i18n/th.php
index 59146f556..96f23bb5f 100644
--- a/web/inc/i18n/th.php
+++ b/web/inc/i18n/th.php
@@ -749,10 +749,11 @@ $LANG['th'] = array(
     'Use server hostname' => 'ใช้ server hostname',
     'Use domain hostname' => 'ใช้ domain hostname',
     'Use STARTTLS' => 'ใช้ STARTTLS',
-    'Use SSL' => 'ใช้ SSL',
+    'Use SSL / TLS' => 'ใช้ SSL / TLS',
     'No encryption' => 'ไม่มี encryption',
     'Do not use encryption' => 'ไม่ใช้ encryption',
 
     'maximum characters length, including prefix' => 'ความยาว charset สูงสุด %s ตัว, รวมถึงคำนำหน้า',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php
index 2e93c99d0..7f2875b99 100644
--- a/web/inc/i18n/tr.php
+++ b/web/inc/i18n/tr.php
@@ -748,10 +748,11 @@ $LANG['tr'] = array(
     'Use server hostname' => 'Use server hostname',
     'Use domain hostname' => 'Use domain hostname',
     'Use STARTTLS' => 'Use STARTTLS',
-    'Use SSL' => 'Use SSL',
+    'Use SSL / TLS' => 'Use SSL / TLS',
     'No encryption' => 'No encryption',
     'Do not use encryption' => 'Do not use encryption',
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php
index c01832ced..02b5a29aa 100644
--- a/web/inc/i18n/tw.php
+++ b/web/inc/i18n/tw.php
@@ -752,10 +752,11 @@ $LANG['tw'] = array(
     'Use server hostname' => '使用伺服器主機名稱',
     'Use domain hostname' => '使用網域主機名稱',
     'Use STARTTLS' => '使用 STARTTLS',
-    'Use SSL' => '使用 SSL',
+    'Use SSL / TLS' => '使用 SSL / TLS',
     'No encryption' => '不加密',
     'Do not use encryption' => '不要使用加密',
 
     'maximum characters length, including prefix' => '最多 %s 字元(包含前綴)',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php
index 698f37be3..cf47496d8 100644
--- a/web/inc/i18n/ua.php
+++ b/web/inc/i18n/ua.php
@@ -748,10 +748,11 @@ $LANG['ua'] = array(
     'Use server hostname' => "Використовувати серверне ім'я хоста",
     'Use domain hostname' => "Використовувати доменне ім'я хоста",
     'Use STARTTLS' => 'Використовувати STARTTLS',
-    'Use SSL' => 'Використовувати SSL',
+    'Use SSL / TLS' => 'Використовувати SSL / TLS',
     'No encryption' => 'Без шифрування',
     'Do not use encryption' => 'Не використовувати шифрування',
 
     'maximum characters length, including prefix' => 'максимальна %s кількість символів, включаючи префікс',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php
index b0c468a7c..8a74126cb 100644
--- a/web/inc/i18n/vi.php
+++ b/web/inc/i18n/vi.php
@@ -746,10 +746,11 @@ $LANG['vi'] = array(
     'Use server hostname' => 'Sử dụng hostname của máy chủ',
     'Use domain hostname' => 'Sử dụng hostname của tên miền',
     'Use STARTTLS' => 'Sử dụng STARTTLS',
-    'Use SSL' => 'Sử dụng SSL',
+    'Use SSL / TLS' => 'Sử dụng SSL / TLS',
     'No encryption' => 'Sử dụng mã hóa',
     'Do not use encryption' => 'Không dùng mã hóa',
 
     'maximum characters length, including prefix' => 'tối đa %s ký tự, bao gồm tiền tố',
 
+    'Email Credentials' => 'Email Credentials',
 );
diff --git a/web/inc/main.php b/web/inc/main.php
index 8cef2a012..38d478922 100644
--- a/web/inc/main.php
+++ b/web/inc/main.php
@@ -3,7 +3,7 @@
 session_start();
 
 define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/');
-define('JS_LATEST_UPDATE', '1491697867');
+define('JS_LATEST_UPDATE', '1491697868');
 
 $i = 0;
 
diff --git a/web/js/pages/add_mail_acc.js b/web/js/pages/add_mail_acc.js
index fa19a3b49..3a921202d 100644
--- a/web/js/pages/add_mail_acc.js
+++ b/web/js/pages/add_mail_acc.js
@@ -155,9 +155,9 @@ $(document).ready(function() {
                 break;
             case 'ssl':
                 $('#td_imap_port').html('993');
-                $('#td_imap_encryption').html('SSL');
+                $('#td_imap_encryption').html('SSL / TLS');
                 $('#td_smtp_port').html('465');
-                $('#td_smtp_encryption').html('SSL');
+                $('#td_smtp_encryption').html('SSL / TLS');
                 break;
             case 'no_encryption':
                 $('#td_imap_hostname').html(opt.attr('domain'));
diff --git a/web/js/pages/edit_mail_acc.js b/web/js/pages/edit_mail_acc.js
index ab6b53c01..f57db54f4 100644
--- a/web/js/pages/edit_mail_acc.js
+++ b/web/js/pages/edit_mail_acc.js
@@ -156,9 +156,9 @@ $(document).ready(function() {
                 break;
             case 'ssl':
                 $('#td_imap_port').html('993');
-                $('#td_imap_encryption').html('SSL');
+                $('#td_imap_encryption').html('SSL / TLS');
                 $('#td_smtp_port').html('465');
-                $('#td_smtp_encryption').html('SSL');
+                $('#td_smtp_encryption').html('SSL / TLS');
                 break;
             case 'no_encryption':
                 $('#td_imap_hostname').html(opt.attr('domain'));
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index f0e6e1acd..0f2ea2d05 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -151,7 +151,7 @@
                                     <option v_type="hostname" domain="<?=$hostname?>"><?=__('Use server hostname')?></option>
                                     <option v_type="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
                                     <option v_type="starttls"><?=__('Use STARTTLS')?></option>
-                                    <option v_type="ssl"><?=__('Use SSL')?></option>
+                                    <option v_type="ssl"><?=__('Use SSL / TLS')?></option>
                                     <option v_type="no_encryption" domain="<?=htmlentities(trim($v_domain, "'"))?>" no_encryption="<?=__('No encryption')?>"><?=__('No encryption')?></option>
                                 </select>
                             </td>
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index 79b6e32cd..c9b7ed85b 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -158,7 +158,7 @@
                                     <option v_type="hostname" domain="<?=$hostname?>"><?=__('Use server hostname')?></option>
                                     <option v_type="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
                                     <option v_type="starttls"><?=__('Use STARTTLS')?></option>
-                                    <option v_type="ssl"><?=__('Use SSL')?></option>
+                                    <option v_type="ssl"><?=__('Use SSL / TLS')?></option>
                                     <option v_type="no_encryption" domain="<?=htmlentities(trim($v_domain, "'"))?>" no_encryption="<?=__('No encryption')?>"><?=__('No encryption')?></option>
                                 </select>
                             </td>