diff --git a/samba/filepropertiesplugin/sambausershareplugin.cpp b/samba/filepropertiesplugin/sambausershareplugin.cpp
--- a/samba/filepropertiesplugin/sambausershareplugin.cpp
+++ b/samba/filepropertiesplugin/sambausershareplugin.cpp
@@ -238,10 +238,13 @@
 void SambaUserSharePlugin::toggleShareStatus(bool checked)
 {
     propertiesUi.sambaNameEdit->setEnabled(checked);
-    propertiesUi.sambaAllowGuestChk->setCheckable(checked);
+    propertiesUi.sambaNameEdit->setEnabled(checked);
+    propertiesUi.sambaAllowGuestChk->setEnabled(checked);
     propertiesUi.tableView->setEnabled(checked);
     if (checked && propertiesUi.sambaNameEdit->text().isEmpty()) {
         propertiesUi.sambaNameEdit->setText(getNewShareName());
+    } else {
+        propertiesUi.sambaNameEdit->setText(QString());
     }
 }
 
diff --git a/samba/filepropertiesplugin/sambausershareplugin.ui b/samba/filepropertiesplugin/sambausershareplugin.ui
--- a/samba/filepropertiesplugin/sambausershareplugin.ui
+++ b/samba/filepropertiesplugin/sambausershareplugin.ui
@@ -32,6 +32,9 @@
      </property>
      <item row="0" column="0">
       <widget class="QLabel" name="textLabel1">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="text">
         <string>Name:</string>
        </property>
@@ -50,7 +53,7 @@
      <item>
       <widget class="QCheckBox" name="sambaAllowGuestChk">
        <property name="enabled">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
        <property name="text">
         <string>Allow Guests</string>