diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp
index 2f1202e8..0bd5fb47 100644
--- a/kdepasswd/kcm/main.cpp
+++ b/kdepasswd/kcm/main.cpp
@@ -76,6 +76,7 @@ KCMUserAccount::KCMUserAccount( QWidget *parent, const QVariantList &)
     connect( _mw->leOrganization, SIGNAL(textChanged(QString)), SLOT(changed()));
     connect( _mw->leEmail, SIGNAL(textChanged(QString)), SLOT(changed()));
     connect( _mw->leSMTP, SIGNAL(textChanged(QString)), SLOT(changed()));
+    connect( _mw->leSSL, SIGNAL(currentIndexChanged(QString)), SLOT(changed()));
 
     _ku = new KUser();
     _kes = new KEMailSettings();
@@ -152,6 +153,14 @@ void KCMUserAccount::load()
     _mw->leEmail->setText( _kes->getSetting( KEMailSettings::EmailAddress ));
     _mw->leOrganization->setText( _kes->getSetting( KEMailSettings::Organization ));
     _mw->leSMTP->setText( _kes->getSetting( KEMailSettings::OutServer ));
+    const QString serverssl = _kes->getSetting( KEMailSettings::OutServerSSL );
+    const int sslmatchindex = _mw->leSSL->findText(serverssl, Qt::MatchFixedString);
+    if (sslmatchindex >= 0) {
+        _mw->leSSL->setCurrentIndex( sslmatchindex );
+    } else {
+        // try, same default as KEMail
+        _mw->leSSL->setCurrentIndex( 1 );
+    }
 
     // load user face
     _facePixmap = QPixmap( KCFGUserAccount::faceFile() );
@@ -239,6 +248,7 @@ void KCMUserAccount::save()
     _kes->setSetting( KEMailSettings::EmailAddress, _mw->leEmail->text() );
     _kes->setSetting( KEMailSettings::Organization, _mw->leOrganization->text() );
     _kes->setSetting( KEMailSettings::OutServer, _mw->leSMTP->text() );
+    _kes->setSetting( KEMailSettings::OutServerSSL, _mw->leSSL->currentText().toLower() );
 }
 
 void KCMUserAccount::changeFace(const QPixmap &pix)
diff --git a/kdepasswd/kcm/main_widget.ui b/kdepasswd/kcm/main_widget.ui
index cf676213..3a4bcbb5 100644
--- a/kdepasswd/kcm/main_widget.ui
+++ b/kdepasswd/kcm/main_widget.ui
@@ -119,6 +119,13 @@
       <string>User Information</string>
      </property>
      <layout class="QGridLayout">
+      <item row="0" column="1">
+       <widget class="KLineEdit" name="leRealname">
+        <property name="showClearButton" stdset="0">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="0">
        <widget class="QLabel" name="lblRealName">
         <property name="text">
@@ -135,13 +142,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="KLineEdit" name="leRealname">
-        <property name="showClearButton" stdset="0">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="lblOrganisation">
         <property name="text">
@@ -165,6 +165,23 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="1">
+       <widget class="KLineEdit" name="leEmail">
+        <property name="showClearButton" stdset="0">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QLabel" name="lblUID">
+        <property name="text">
+         <string/>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="0">
        <widget class="QLabel" name="lblEmail">
         <property name="text">
@@ -181,13 +198,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="KLineEdit" name="leEmail">
-        <property name="showClearButton" stdset="0">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="0">
        <widget class="QLabel" name="textLabel3">
         <property name="text">
@@ -211,7 +221,7 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
+      <item row="5" column="0">
        <widget class="QLabel" name="lblUIDTell">
         <property name="text">
          <string>User ID:</string>
@@ -225,12 +235,31 @@
        </widget>
       </item>
       <item row="4" column="1">
-       <widget class="QLabel" name="lblUID">
+       <widget class="QComboBox" name="leSSL">
+        <item>
+         <property name="text">
+          <string>No</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Try</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Yes</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="lblSSL">
         <property name="text">
-         <string/>
+         <string>Use SSL:</string>
         </property>
-        <property name="wordWrap">
-         <bool>false</bool>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>