diff --git a/kdirshare/filepropertiesplugin/kdirshareplugin.cpp b/kdirshare/filepropertiesplugin/kdirshareplugin.cpp
index f3ae9161..babfb4d3 100644
--- a/kdirshare/filepropertiesplugin/kdirshareplugin.cpp
+++ b/kdirshare/filepropertiesplugin/kdirshareplugin.cpp
@@ -105,6 +105,11 @@ KDirSharePlugin::KDirSharePlugin(QObject *parent, const QList<QVariant> &args)
         }
         if (!m_ui.useredit->text().isEmpty()) {
             m_ui.authbox->setChecked(true);
+        } else {
+            m_ui.userlabel->setEnabled(false);
+            m_ui.useredit->setEnabled(false);
+            m_ui.passwordedit->setEnabled(false);
+            m_ui.passlabel->setEnabled(false);
         }
         m_ui.useredit->setEnabled(m_ui.authbox->isChecked());
         m_ui.passwordedit->setEnabled(m_ui.authbox->isChecked());
@@ -201,8 +206,10 @@ void KDirSharePlugin::slotPortMax(const int value)
 void KDirSharePlugin::slotAuthorization(const bool value)
 {
     // qDebug() << Q_FUNC_INFO << value;
+    m_ui.userlabel->setEnabled(value);
     m_ui.useredit->setEnabled(value);
     m_ui.passwordedit->setEnabled(value);
+    m_ui.passlabel->setEnabled(value);
     if (!value) {
         m_ui.useredit->clear();
         m_ui.passwordedit->clear();
diff --git a/kdirshare/filepropertiesplugin/kdirshareplugin.ui b/kdirshare/filepropertiesplugin/kdirshareplugin.ui
index 14ae91b5..2c3151a9 100644
--- a/kdirshare/filepropertiesplugin/kdirshareplugin.ui
+++ b/kdirshare/filepropertiesplugin/kdirshareplugin.ui
@@ -88,7 +88,7 @@
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="label">
+       <widget class="QLabel" name="userlabel">
         <property name="text">
          <string>User:</string>
         </property>
@@ -101,7 +101,7 @@
        <widget class="QLineEdit" name="useredit"/>
       </item>
       <item row="3" column="0">
-       <widget class="QLabel" name="label_2">
+       <widget class="QLabel" name="passlabel">
         <property name="text">
          <string>Password:</string>
         </property>