diff --git a/internal/frontend/qml/SMTPSettings.qml b/internal/frontend/qml/SMTPSettings.qml
index caddb67e..24c11d79 100644
--- a/internal/frontend/qml/SMTPSettings.qml
+++ b/internal/frontend/qml/SMTPSettings.qml
@@ -84,6 +84,8 @@ SettingsView {
                 submitButton.loading = true
                 root.submit()
             }
+
+            enabled: sslButton.checked !== root.backend.useSSLforSMTP
         }
 
         Button {
@@ -100,10 +102,6 @@ SettingsView {
         }
     }
 
-    onBack: {
-        root.setDefaultValues()
-    }
-
     function submit(){
         submitButton.loading = true
         root.backend.toggleUseSSLforSMTP(sslButton.checked)
@@ -114,6 +112,7 @@ SettingsView {
         starttlsButton.checked = !root.backend.useSSLforSMTP
     }
 
-
-    Component.onCompleted: root.setDefaultValues()
+    onVisibleChanged: {
+        root.setDefaultValues()
+    }
 }
diff --git a/internal/frontend/qt/frontend_settings.go b/internal/frontend/qt/frontend_settings.go
index 3a2467a9..c3567a72 100644
--- a/internal/frontend/qt/frontend_settings.go
+++ b/internal/frontend/qt/frontend_settings.go
@@ -108,7 +108,7 @@ func (f *FrontendQt) toggleUseSSLforSMTP(makeItEnabled bool) {
 		f.qml.SetUseSSLforSMTP(makeItEnabled)
 		return
 	}
-	f.settings.SetBool(settings.SMTPPortKey, makeItEnabled)
+	f.settings.SetBool(settings.SMTPSSLKey, makeItEnabled)
 	f.restart()
 }