diff --git a/internal/frontend/bridge-gui/bridge-gui-tester/GRPCService.cpp b/internal/frontend/bridge-gui/bridge-gui-tester/GRPCService.cpp
index 4c72200b..3f6b7c6c 100644
--- a/internal/frontend/bridge-gui/bridge-gui-tester/GRPCService.cpp
+++ b/internal/frontend/bridge-gui/bridge-gui-tester/GRPCService.cpp
@@ -623,7 +623,7 @@ Status GRPCService::MailServerSettings(ServerContext *, Empty const *, ImapSmtpS
     outSettings->set_imapport(tab.imapPort());
     outSettings->set_smtpport(tab.smtpPort());
     outSettings->set_usesslforimap(tab.useSSLForIMAP());
-    outSettings->set_usesslforimap(tab.useSSLForSMTP());
+    outSettings->set_usesslforsmtp(tab.useSSLForSMTP());
     return Status::OK;
 }
 
diff --git a/internal/frontend/bridge-gui/bridge-gui-tester/Tabs/SettingsTab.ui b/internal/frontend/bridge-gui/bridge-gui-tester/Tabs/SettingsTab.ui
index da8d6c1f..22d04cca 100644
--- a/internal/frontend/bridge-gui/bridge-gui-tester/Tabs/SettingsTab.ui
+++ b/internal/frontend/bridge-gui/bridge-gui-tester/Tabs/SettingsTab.ui
@@ -217,7 +217,7 @@
            </layout>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0,0,0,1,0">
+           <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0,0,0,0,1">
             <item>
              <widget class="QLabel" name="labelMAP">
               <property name="text">
@@ -259,16 +259,16 @@
              </widget>
             </item>
             <item>
-             <widget class="QCheckBox" name="checkUseSSLForSMTP">
+             <widget class="QCheckBox" name="checkUseSSLForIMAP">
               <property name="text">
-               <string>Use SSL For SMTP</string>
+               <string>Use SSL For IMAP</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QCheckBox" name="checkUseSSLForIMAP">
+             <widget class="QCheckBox" name="checkUseSSLForSMTP">
               <property name="text">
-               <string>Use SSL For IMAP</string>
+               <string>Use SSL For SMTP</string>
               </property>
              </widget>
             </item>