diff --git a/resources/dav/resource/configdialog.cpp b/resources/dav/resource/configdialog.cpp
index 9ddb81f08..30960f063 100644
--- a/resources/dav/resource/configdialog.cpp
+++ b/resources/dav/resource/configdialog.cpp
@@ -1,331 +1,331 @@
 /*
     Copyright (c) 2009 Grégory Oestreicher <greg@kamago.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include "configdialog.h"
 #include "searchdialog.h"
 #include "settings.h"
 #include "utils.h"
 #include "urlconfigurationdialog.h"
 
 #include <KDAV/DavUrl>
 #include <kconfigdialogmanager.h>
 #include <kconfigskeleton.h>
 #include <KLocalizedString>
 #include <kmessagebox.h>
 
 #include <QList>
 #include <QPointer>
 #include <QStringList>
 #include <QStandardItem>
 #include <QStandardItemModel>
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
 
 ConfigDialog::ConfigDialog(QWidget *parent)
     : QDialog(parent)
 {
     setWindowIcon(QIcon::fromTheme(QStringLiteral("folder-remote")));
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     QWidget *mainWidget = new QWidget(this);
     mainLayout->addWidget(mainWidget);
     mUi.setupUi(mainWidget);
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     mOkButton = buttonBox->button(QDialogButtonBox::Ok);
     mOkButton->setDefault(true);
     mOkButton->setShortcut(Qt::CTRL | Qt::Key_Return);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &ConfigDialog::onCancelClicked);
     mainLayout->addWidget(buttonBox);
 
     mModel = new QStandardItemModel();
     const QStringList headers = { i18n("Protocol"), i18n("URL") };
     mModel->setHorizontalHeaderLabels(headers);
 
     mUi.configuredUrls->setModel(mModel);
     mUi.configuredUrls->setRootIsDecorated(false);
 
     const KDAV::DavUrl::List lstUrls = Settings::self()->configuredDavUrls();
     for (const KDAV::DavUrl &url : lstUrls) {
         QUrl displayUrl = url.url();
         displayUrl.setUserInfo(QString());
         addModelRow(Utils::translatedProtocolName(url.protocol()), displayUrl.toDisplayString());
     }
 
     mUi.syncRangeStartType->addItem(i18n("Days"), QVariant(QLatin1String("D")));
     mUi.syncRangeStartType->addItem(i18n("Months"), QVariant(QLatin1String("M")));
     mUi.syncRangeStartType->addItem(i18n("Years"), QVariant(QLatin1String("Y")));
 
     mManager = new KConfigDialogManager(this, Settings::self());
     mManager->updateWidgets();
 
     const int typeIndex = mUi.syncRangeStartType->findData(QVariant(Settings::self()->syncRangeStartType()));
     mUi.syncRangeStartType->setCurrentIndex(typeIndex);
 
     connect(mUi.kcfg_displayName, &KLineEdit::textChanged, this, &ConfigDialog::checkUserInput);
     connect(mUi.configuredUrls->selectionModel(), &QItemSelectionModel::selectionChanged, this, &ConfigDialog::checkConfiguredUrlsButtonsState);
     connect(mUi.configuredUrls, &QAbstractItemView::doubleClicked, this, &ConfigDialog::onEditButtonClicked);
 
     connect(mUi.syncRangeStartType, SIGNAL(currentIndexChanged(int)), this, SLOT(onSyncRangeStartTypeChanged()));
     connect(mUi.addButton, &QPushButton::clicked, this, &ConfigDialog::onAddButtonClicked);
     connect(mUi.searchButton, &QPushButton::clicked, this, &ConfigDialog::onSearchButtonClicked);
     connect(mUi.removeButton, &QPushButton::clicked, this, &ConfigDialog::onRemoveButtonClicked);
     connect(mUi.editButton, &QPushButton::clicked, this, &ConfigDialog::onEditButtonClicked);
 
     connect(mOkButton, &QPushButton::clicked, this, &ConfigDialog::onOkClicked);
 
     checkUserInput();
     readConfig();
 }
 
 ConfigDialog::~ConfigDialog()
 {
     writeConfig();
 }
 
 void ConfigDialog::readConfig()
 {
     KConfigGroup grp(KSharedConfig::openConfig(), "ConfigDialog");
     const QSize size = grp.readEntry("Size", QSize(300, 200));
     if (size.isValid()) {
         resize(size);
     }
 }
 
 void ConfigDialog::writeConfig()
 {
     KConfigGroup grp(KSharedConfig::openConfig(), "ConfigDialog");
     grp.writeEntry("Size", size());
     grp.sync();
 }
 
 void ConfigDialog::setPassword(const QString &password)
 {
-    mUi.password->setText(password);
+    mUi.password->setPassword(password);
 }
 
 void ConfigDialog::onSyncRangeStartTypeChanged()
 {
     Settings::self()->setSyncRangeStartType(mUi.syncRangeStartType->currentData().toString());
 }
 
 void ConfigDialog::checkUserInput()
 {
     checkConfiguredUrlsButtonsState();
 
     if (!mUi.kcfg_displayName->text().trimmed().isEmpty() && !(mModel->invisibleRootItem()->rowCount() == 0)) {
         mOkButton->setEnabled(true);
     } else {
         mOkButton->setEnabled(false);
     }
 }
 
 void ConfigDialog::onAddButtonClicked()
 {
     QPointer<UrlConfigurationDialog> dlg = new UrlConfigurationDialog(this);
     dlg->setDefaultUsername(mUi.kcfg_defaultUsername->text());
-    dlg->setDefaultPassword(mUi.password->text());
+    dlg->setDefaultPassword(mUi.password->password());
     const int result = dlg->exec();
 
     if (result == QDialog::Accepted && !dlg.isNull()) {
         if (Settings::self()->urlConfiguration(KDAV::Protocol(dlg->protocol()), dlg->remoteUrl())) {
             KMessageBox::error(this, i18n("Another configuration entry already uses the same URL/protocol couple.\n"
                                           "Please use a different URL"));
         } else {
             Settings::UrlConfiguration *urlConfig = new Settings::UrlConfiguration();
 
             urlConfig->mUrl = dlg->remoteUrl();
             if (dlg->useDefaultCredentials()) {
                 urlConfig->mUser = QStringLiteral("$default$");
             } else {
                 urlConfig->mUser = dlg->username();
                 urlConfig->mPassword = dlg->password();
             }
             urlConfig->mProtocol = dlg->protocol();
 
             Settings::self()->newUrlConfiguration(urlConfig);
 
             const QString protocolName = Utils::translatedProtocolName(dlg->protocol());
 
             addModelRow(protocolName, dlg->remoteUrl());
             mAddedUrls << QPair<QString, KDAV::Protocol>(dlg->remoteUrl(), KDAV::Protocol(dlg->protocol()));
             checkUserInput();
         }
     }
 
     delete dlg;
 }
 
 void ConfigDialog::onSearchButtonClicked()
 {
     QPointer<SearchDialog> dlg = new SearchDialog(this);
     dlg->setUsername(mUi.kcfg_defaultUsername->text());
-    dlg->setPassword(mUi.password->text());
+    dlg->setPassword(mUi.password->password());
     const int result = dlg->exec();
 
     if (result == QDialog::Accepted && !dlg.isNull()) {
         const QStringList results = dlg->selection();
         for (const QString &result : results) {
             const QStringList split = result.split(QLatin1Char('|'));
             KDAV::Protocol protocol = KDAV::Utils::protocolByName(split.at(0));
             if (!Settings::self()->urlConfiguration(protocol, split.at(1))) {
                 Settings::UrlConfiguration *urlConfig = new Settings::UrlConfiguration();
 
                 urlConfig->mUrl = split.at(1);
                 if (dlg->useDefaultCredentials()) {
                     urlConfig->mUser = QStringLiteral("$default$");
                 } else {
                     urlConfig->mUser = dlg->username();
                     urlConfig->mPassword = dlg->password();
                 }
                 urlConfig->mProtocol = protocol;
 
                 Settings::self()->newUrlConfiguration(urlConfig);
 
                 addModelRow(Utils::translatedProtocolName(protocol), split.at(1));
                 mAddedUrls << QPair<QString, KDAV::Protocol>(split.at(1), protocol);
                 checkUserInput();
             }
         }
     }
 
     delete dlg;
 }
 
 void ConfigDialog::onRemoveButtonClicked()
 {
     const QModelIndexList indexes = mUi.configuredUrls->selectionModel()->selectedRows();
     if (indexes.isEmpty()) {
         return;
     }
 
     QString proto = mModel->index(indexes.at(0).row(), 0).data().toString();
     QString url = mModel->index(indexes.at(0).row(), 1).data().toString();
 
     mRemovedUrls << QPair<QString, KDAV::Protocol>(url, Utils::protocolByTranslatedName(proto));
     mModel->removeRow(indexes.at(0).row());
 
     checkUserInput();
 }
 
 void ConfigDialog::onEditButtonClicked()
 {
     const QModelIndexList indexes = mUi.configuredUrls->selectionModel()->selectedRows();
     if (indexes.isEmpty()) {
         return;
     }
 
     const int row = indexes.at(0).row();
     const QString proto = mModel->index(row, 0).data().toString();
     const QString url = mModel->index(row, 1).data().toString();
 
     Settings::UrlConfiguration *urlConfig = Settings::self()->urlConfiguration(Utils::protocolByTranslatedName(proto), url);
     if (!urlConfig) {
         return;
     }
 
     QPointer<UrlConfigurationDialog> dlg = new UrlConfigurationDialog(this);
     dlg->setRemoteUrl(urlConfig->mUrl);
     dlg->setProtocol(KDAV::Protocol(urlConfig->mProtocol));
 
     if (urlConfig->mUser == QLatin1String("$default$")) {
         dlg->setUseDefaultCredentials(true);
     } else {
         dlg->setUseDefaultCredentials(false);
         dlg->setUsername(urlConfig->mUser);
         dlg->setPassword(urlConfig->mPassword);
     }
     dlg->setDefaultUsername(mUi.kcfg_defaultUsername->text());
-    dlg->setDefaultPassword(mUi.password->text());
+    dlg->setDefaultPassword(mUi.password->password());
 
     const int result = dlg->exec();
 
     if (result == QDialog::Accepted && !dlg.isNull()) {
         Settings::self()->removeUrlConfiguration(Utils::protocolByTranslatedName(proto), url);
         Settings::UrlConfiguration *urlConfigAccepted = new Settings::UrlConfiguration();
         urlConfigAccepted->mUrl = dlg->remoteUrl();
         if (dlg->useDefaultCredentials()) {
             urlConfigAccepted->mUser = QStringLiteral("$default$");
         } else {
             urlConfigAccepted->mUser = dlg->username();
             urlConfigAccepted->mPassword = dlg->password();
         }
         urlConfigAccepted->mProtocol = dlg->protocol();
         Settings::self()->newUrlConfiguration(urlConfigAccepted);
 
         mModel->removeRow(row);
         insertModelRow(row, Utils::translatedProtocolName(dlg->protocol()), dlg->remoteUrl());
     }
     delete dlg;
 }
 
 void ConfigDialog::onOkClicked()
 {
     typedef QPair<QString, KDAV::Protocol> UrlPair;
     for (const UrlPair &url : qAsConst(mRemovedUrls)) {
         Settings::self()->removeUrlConfiguration(url.second, url.first);
     }
 
     mManager->updateSettings();
-    Settings::self()->setDefaultPassword(mUi.password->text());
+    Settings::self()->setDefaultPassword(mUi.password->password());
     accept();
 }
 
 void ConfigDialog::onCancelClicked()
 {
     mRemovedUrls.clear();
 
     typedef QPair<QString, KDAV::Protocol> UrlPair;
     for (const UrlPair &url : qAsConst(mAddedUrls)) {
         Settings::self()->removeUrlConfiguration(url.second, url.first);
     }
     reject();
 }
 
 void ConfigDialog::checkConfiguredUrlsButtonsState()
 {
     const bool enabled = mUi.configuredUrls->selectionModel()->hasSelection();
 
     mUi.removeButton->setEnabled(enabled);
     mUi.editButton->setEnabled(enabled);
 }
 
 void ConfigDialog::addModelRow(const QString &protocol, const QString &url)
 {
     insertModelRow(-1, protocol, url);
 }
 
 void ConfigDialog::insertModelRow(int index, const QString &protocol, const QString &url)
 {
     QStandardItem *rootItem = mModel->invisibleRootItem();
     QList<QStandardItem *> items;
 
     QStandardItem *protocolStandardItem = new QStandardItem(protocol);
     protocolStandardItem->setEditable(false);
     items << protocolStandardItem;
 
     QStandardItem *urlStandardItem = new QStandardItem(url);
     urlStandardItem->setEditable(false);
     items << urlStandardItem;
 
     if (index == -1) {
         rootItem->appendRow(items);
     } else {
         rootItem->insertRow(index, items);
     }
 }
 
diff --git a/resources/dav/resource/configdialog.ui b/resources/dav/resource/configdialog.ui
index 9b4430e10..5a24f0c17 100644
--- a/resources/dav/resource/configdialog.ui
+++ b/resources/dav/resource/configdialog.ui
@@ -1,375 +1,374 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ConfigDialog</class>
  <widget class="QWidget" name="ConfigDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>534</width>
     <height>547</height>
    </rect>
   </property>
   <property name="locale">
    <locale language="English" country="UnitedStates"/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>General Configuration</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_5">
       <item>
        <layout class="QFormLayout" name="formLayout">
         <item row="0" column="0">
          <widget class="QLabel" name="label_6">
           <property name="locale">
            <locale language="English" country="UnitedStates"/>
           </property>
           <property name="text">
            <string>Display name:</string>
           </property>
          </widget>
         </item>
         <item row="0" column="1">
          <widget class="KLineEdit" name="kcfg_displayName"/>
         </item>
         <item row="1" column="0">
          <widget class="QLabel" name="label_2">
           <property name="locale">
            <locale language="English" country="UnitedStates"/>
           </property>
           <property name="text">
            <string>Refresh every:</string>
           </property>
          </widget>
         </item>
         <item row="1" column="1">
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QSpinBox" name="kcfg_refreshInterval">
             <property name="locale">
              <locale language="English" country="UnitedStates"/>
             </property>
             <property name="specialValueText">
              <string>Never</string>
             </property>
             <property name="value">
              <number>5</number>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QLabel" name="label_3">
             <property name="locale">
              <locale language="English" country="UnitedStates"/>
             </property>
             <property name="text">
              <string>minutes</string>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="horizontalSpacer">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
         <item row="2" column="0">
          <widget class="QLabel" name="label">
           <property name="locale">
            <locale language="English" country="UnitedStates"/>
           </property>
           <property name="text">
            <string>Username:</string>
           </property>
          </widget>
         </item>
         <item row="2" column="1">
          <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="2,1">
           <item>
            <widget class="QLineEdit" name="kcfg_defaultUsername">
             <property name="locale">
              <locale language="English" country="UnitedStates"/>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="horizontalSpacer_2">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
         <item row="3" column="0">
          <widget class="QLabel" name="label_4">
           <property name="locale">
            <locale language="English" country="UnitedStates"/>
           </property>
           <property name="text">
            <string>Password:</string>
           </property>
          </widget>
         </item>
         <item row="3" column="1">
          <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="2,1">
           <item>
-           <widget class="QLineEdit" name="password">
-            <property name="locale">
-             <locale language="English" country="UnitedStates"/>
-            </property>
-            <property name="echoMode">
-             <enum>QLineEdit::Password</enum>
-            </property>
+           <widget class="KPasswordLineEdit" name="password">
            </widget>
           </item>
           <item>
            <spacer name="horizontalSpacer_3">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="locale">
       <locale language="English" country="UnitedStates"/>
      </property>
      <property name="title">
       <string>Server Configuration</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <widget class="QTreeView" name="configuredUrls"/>
         </item>
         <item>
          <layout class="QVBoxLayout" name="verticalLayout">
           <item>
            <widget class="QPushButton" name="addButton">
             <property name="text">
              <string>Add</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QPushButton" name="searchButton">
             <property name="text">
              <string>Search</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QPushButton" name="removeButton">
             <property name="text">
              <string>Remove</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QPushButton" name="editButton">
             <property name="text">
              <string>Edit</string>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>40</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Synchronization</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QCheckBox" name="kcfg_limitSyncRange">
         <property name="toolTip">
          <string>Select this if your calendars contain a lot of events and the server cannot fulfill the requests</string>
         </property>
         <property name="locale">
          <locale language="English" country="UnitedStates"/>
         </property>
         <property name="text">
          <string>Limit CalDav retrieval time range</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_6">
         <item>
          <widget class="QLabel" name="label_5">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="locale">
            <locale language="English" country="UnitedStates"/>
           </property>
           <property name="text">
            <string>Only sync events more recent than</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QSpinBox" name="kcfg_syncRangeStartNumber">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="locale">
            <locale language="English" country="UnitedStates"/>
           </property>
           <property name="minimum">
            <number>1</number>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QComboBox" name="syncRangeStartType">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="locale">
            <locale language="English" country="UnitedStates"/>
           </property>
          </widget>
         </item>
         <item>
          <spacer name="horizontalSpacer_4">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>KPasswordLineEdit</class>
+   <extends>QWidget</extends>
+   <header>kpasswordlineedit.h</header>
+  </customwidget>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>kcfg_limitSyncRange</sender>
    <signal>toggled(bool)</signal>
    <receiver>label_5</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>30</x>
      <y>485</y>
     </hint>
     <hint type="destinationlabel">
      <x>193</x>
      <y>512</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_limitSyncRange</sender>
    <signal>toggled(bool)</signal>
    <receiver>kcfg_syncRangeStartNumber</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>264</x>
      <y>488</y>
     </hint>
     <hint type="destinationlabel">
      <x>267</x>
      <y>516</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_limitSyncRange</sender>
    <signal>toggled(bool)</signal>
    <receiver>syncRangeStartType</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>332</x>
      <y>489</y>
     </hint>
     <hint type="destinationlabel">
      <x>331</x>
      <y>510</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>