diff --git a/ui/src/app/admin/admin.controller.js b/ui/src/app/admin/admin.controller.js
index 256faf0245..fa1c9920ee 100644
--- a/ui/src/app/admin/admin.controller.js
+++ b/ui/src/app/admin/admin.controller.js
@@ -25,6 +25,8 @@ export default function AdminController(adminService, toast, $scope, $rootScope,
         return protocol;
     });
 
+    vm.tlsVersions = ['TLSv1.0', 'TLSv1.1', 'TLSv1.2', 'TLSv1.3'];
+
     $translate('admin.test-mail-sent').then(function (translation) {
         vm.testMailSent = translation;
     }, function (translationId) {
diff --git a/ui/src/app/admin/outgoing-mail-settings.tpl.html b/ui/src/app/admin/outgoing-mail-settings.tpl.html
index 20f988f866..edb2e4e520 100644
--- a/ui/src/app/admin/outgoing-mail-settings.tpl.html
+++ b/ui/src/app/admin/outgoing-mail-settings.tpl.html
@@ -82,7 +82,11 @@
 								 aria-label="{{ 'admin.enable-tls' | translate }}" ng-model="vm.settings.jsonValue.enableTls">{{ 'admin.enable-tls' | translate }}</md-checkbox>
 					<md-input-container class="md-block" ng-if="vm.settings.jsonValue.enableTls">
 						<label translate>admin.tls-version</label>
-						<input name="tlsVersion" placeholder="{{ 'admin.enter-tls-version' | translate }}" ng-model="vm.settings.jsonValue.tlsVersion">
+						<md-select ng-disabled="$root.loading" ng-model="vm.settings.jsonValue.tlsVersion">
+							<md-option ng-repeat="tlsVersion in vm.tlsVersions" value="{{tlsVersion}}">
+								{{tlsVersion}}
+							</md-option>
+						</md-select>
 					</md-input-container>
 					<md-input-container class="md-block">
 						<label translate>common.username</label>
diff --git a/ui/src/app/locale/locale.constant-cs_CZ.json b/ui/src/app/locale/locale.constant-cs_CZ.json
index 59d6fd5ece..76311883a8 100644
--- a/ui/src/app/locale/locale.constant-cs_CZ.json
+++ b/ui/src/app/locale/locale.constant-cs_CZ.json
@@ -84,7 +84,6 @@
         "timeout-invalid": "Tohle nevypadá jako platný časový limit.",
         "enable-tls": "Povolit TLS",
         "tls-version": "Verze TLS",
-        "enter-tls-version" : "Zadejte verzi TLS",
         "send-test-mail": "Odeslat testovací zprávu"
     },
     "alarm": {
diff --git a/ui/src/app/locale/locale.constant-de_DE.json b/ui/src/app/locale/locale.constant-de_DE.json
index 7fb595a882..57d64c104e 100644
--- a/ui/src/app/locale/locale.constant-de_DE.json
+++ b/ui/src/app/locale/locale.constant-de_DE.json
@@ -84,7 +84,6 @@
     "timeout-invalid": "Das ist keine gültige Wartezeit.",
     "enable-tls": "TLS aktivieren",
     "tls-version" : "TLS-Version",
-    "enter-tls-version" : "Geben Sie die TLS-Version ein",
     "send-test-mail": "Test E-Mail senden",
     "security-settings": "Sicherheitseinstellungen",
     "password-policy": "Kennwortrichtlinie",
diff --git a/ui/src/app/locale/locale.constant-el_GR.json b/ui/src/app/locale/locale.constant-el_GR.json
index 7669e705b9..1817c64509 100644
--- a/ui/src/app/locale/locale.constant-el_GR.json
+++ b/ui/src/app/locale/locale.constant-el_GR.json
@@ -89,7 +89,6 @@
     "timeout-invalid": "Αυτή δε φαίνεται να είναι μια έγκυρη τιμή timeout.",
     "enable-tls": "Ενεργοποίηση TLS",
     "tls-version": "Έκδοση TLS",
-    "enter-tls-version" : "Εισαγάγετε την έκδοση TLS",
     "send-test-mail": "Αποστολή δοκιμαστικού μηνύματος",
     "use-system-mail-settings": "Χρήση των ρυθμίσεων διακομιστή αλληλογραφίας συστήματος",
     "mail-templates": "Πρότυπα αλληλογραφίας",
diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json
index cfadab8e1f..52baeda729 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -87,7 +87,6 @@
         "timeout-invalid": "That doesn't look like a valid timeout.",
         "enable-tls": "Enable TLS",
         "tls-version": "TLS version",
-        "enter-tls-version" : "Enter TLS version",
         "send-test-mail": "Send test mail",
         "security-settings": "Security settings",
         "password-policy": "Password policy",
diff --git a/ui/src/app/locale/locale.constant-es_ES.json b/ui/src/app/locale/locale.constant-es_ES.json
index 4b76cd7b70..0473b7df8f 100644
--- a/ui/src/app/locale/locale.constant-es_ES.json
+++ b/ui/src/app/locale/locale.constant-es_ES.json
@@ -86,7 +86,6 @@
         "timeout-invalid": "Eso no parece un tiempo de espera válido.",
         "enable-tls": "Habilitar TLS",
         "tls-version": "Versión TLS",
-        "enter-tls-version" : "Ingrese la versión de TLS",
         "send-test-mail": "Enviar correo de prueba",
         "password-policy": "Política de contraseñas",
         "security-settings": "Configuraciones de seguridad",
diff --git a/ui/src/app/locale/locale.constant-fa_IR.json b/ui/src/app/locale/locale.constant-fa_IR.json
index 968769fe29..4c83a7eea9 100644
--- a/ui/src/app/locale/locale.constant-fa_IR.json
+++ b/ui/src/app/locale/locale.constant-fa_IR.json
@@ -84,7 +84,6 @@
         "timeout-invalid": ".مهلت، به نظر نمي آيد معتبر باشد",
         "enable-tls": "TLS فعال سازي",
         "tls-version": "نسخه TLS",
-        "enter-tls-version" : "نسخه TLS را وارد کنید",
         "send-test-mail": "ارسال پيام آزمايشي"
     },
     "alarm": {
diff --git a/ui/src/app/locale/locale.constant-fr_FR.json b/ui/src/app/locale/locale.constant-fr_FR.json
index c12418652a..f155563742 100644
--- a/ui/src/app/locale/locale.constant-fr_FR.json
+++ b/ui/src/app/locale/locale.constant-fr_FR.json
@@ -57,7 +57,6 @@
         "base-url-required": "L'URL de base est requise.",
         "enable-tls": "Activer TLS",
         "tls-version": "Version TLS",
-        "enter-tls-version" : "Entrez la version TLS",
         "general": "Général",
         "general-settings": "Paramètres généraux",
         "mail-from": "Mail de",
diff --git a/ui/src/app/locale/locale.constant-it_IT.json b/ui/src/app/locale/locale.constant-it_IT.json
index 8b53c91983..f3a6be8d96 100644
--- a/ui/src/app/locale/locale.constant-it_IT.json
+++ b/ui/src/app/locale/locale.constant-it_IT.json
@@ -85,7 +85,6 @@
         "timeout-invalid": "Timeout non valido.",
         "enable-tls": "Abilita TLS",
         "tls-version" : "Versione TLS",
-        "enter-tls-version" : "Inserisci la versione TLS",
         "send-test-mail": "Invia mail di test",
         "security-settings": "Settaggi di sicurezza",
         "password-policy": "Politica password",
diff --git a/ui/src/app/locale/locale.constant-ja_JA.json b/ui/src/app/locale/locale.constant-ja_JA.json
index 6e60c0ed95..4a789094f5 100644
--- a/ui/src/app/locale/locale.constant-ja_JA.json
+++ b/ui/src/app/locale/locale.constant-ja_JA.json
@@ -84,7 +84,6 @@
 		"timeout-invalid": "それは有効なタイムアウトのようには見えません。",
 		"enable-tls": "TLSを有効にする",
 		"tls-version": "TLSバージョン",
-		"enter-tls-version" : "TLSバージョンを入力してください",
 		"send-test-mail": "テストメールを送信する"
 	},
 	"alarm": {
diff --git a/ui/src/app/locale/locale.constant-ko_KR.json b/ui/src/app/locale/locale.constant-ko_KR.json
index 863a12e6de..f9395b1dd6 100644
--- a/ui/src/app/locale/locale.constant-ko_KR.json
+++ b/ui/src/app/locale/locale.constant-ko_KR.json
@@ -84,7 +84,6 @@
         "timeout-invalid": "올바른 제한시간이 아닙니다.",
         "enable-tls": "TLS 사용",
         "tls-version" : "TLS 버전",
-        "enter-tls-version" : "TLS 버전을 입력하세요",
         "send-test-mail": "테스트 메일 보내기"
     },
     "alarm": {
diff --git a/ui/src/app/locale/locale.constant-lv_LV.json b/ui/src/app/locale/locale.constant-lv_LV.json
index 169777a31e..08e7d34b7f 100644
--- a/ui/src/app/locale/locale.constant-lv_LV.json
+++ b/ui/src/app/locale/locale.constant-lv_LV.json
@@ -85,7 +85,6 @@
         "timeout-invalid": "That doesn't look like a valid timeout.",
         "enable-tls": "Enable TLS",
         "tls-version": "TLS version",
-        "enter-tls-version" : "Enter TLS version",
         "send-test-mail": "Send test mail"
     },
     "alarm": {
diff --git a/ui/src/app/locale/locale.constant-ru_RU.json b/ui/src/app/locale/locale.constant-ru_RU.json
index 4ea9dac882..f4ed6d5c93 100644
--- a/ui/src/app/locale/locale.constant-ru_RU.json
+++ b/ui/src/app/locale/locale.constant-ru_RU.json
@@ -86,7 +86,6 @@
         "timeout-invalid": "Недействительный таймаут.",
         "enable-tls": "Включить TLS",
         "tls-version" : "Версия TLS",
-        "enter-tls-version" : "Введите версию TLS",
         "send-test-mail": "Отправить пробное письмо",
         "security-settings": "Настройки безопасности",
         "password-policy": "Политика паролей",
diff --git a/ui/src/app/locale/locale.constant-tr_TR.json b/ui/src/app/locale/locale.constant-tr_TR.json
index 1f5b424faf..a9dd8e7697 100644
--- a/ui/src/app/locale/locale.constant-tr_TR.json
+++ b/ui/src/app/locale/locale.constant-tr_TR.json
@@ -84,7 +84,6 @@
         "timeout-invalid": "Bu geçerli bir zaman aşımı gibi görünmüyor.",
         "enable-tls": "TLS'i etkinleştir.",
         "tls-version" : "TLS sürümü",
-        "enter-tls-version" : "TLS sürümünü girin",
         "send-test-mail": "Test e-postası gönder"
     },
     "alarm": {
diff --git a/ui/src/app/locale/locale.constant-uk_UA.json b/ui/src/app/locale/locale.constant-uk_UA.json
index f1f4f981f5..53d16bea5e 100644
--- a/ui/src/app/locale/locale.constant-uk_UA.json
+++ b/ui/src/app/locale/locale.constant-uk_UA.json
@@ -88,7 +88,6 @@
         "timeout-invalid": "Це не схоже на правильний час очікування.",
         "enable-tls": "Увімкнути TLS",
         "tls-version" : "Версія TLS",
-        "enter-tls-version" : "Вкажіть версію TLS",
         "send-test-mail": "Надіслати тестове повідомлення",
         "use-system-mail-settings": "Використовувати параметри системного поштового сервера",
         "mail-templates": "Шаблони електронної пошти",
diff --git a/ui/src/app/locale/locale.constant-zh_CN.json b/ui/src/app/locale/locale.constant-zh_CN.json
index d3fef3f96a..634aae3f1f 100644
--- a/ui/src/app/locale/locale.constant-zh_CN.json
+++ b/ui/src/app/locale/locale.constant-zh_CN.json
@@ -84,7 +84,6 @@
         "timeout-invalid": "这看起来不像有效的超时值。",
         "enable-tls": "启用TLS",
         "tls-version" : "TLS版本",
-        "enter-tls-version" : "输入TLS版本",
         "send-test-mail": "发送测试邮件"
     },
     "alarm": {
diff --git a/ui/src/app/locale/locale.constant-zh_TW.json b/ui/src/app/locale/locale.constant-zh_TW.json
index 1444cb5cc2..52637b7c82 100644
--- a/ui/src/app/locale/locale.constant-zh_TW.json
+++ b/ui/src/app/locale/locale.constant-zh_TW.json
@@ -84,7 +84,6 @@
         "timeout-invalid": "這看起來不像有效的超時值。",
         "enable-tls": "啟用TLS",
         "tls-version": "TLS版本",
-        "enter-tls-version" : "输入TLS版本",
         "send-test-mail": "發送測試郵件"
     },
     "alarm": {