diff --git a/data/gui/data_form_window.ui b/data/gui/data_form_window.ui
index 84b9f3165..55bf176e2 100644
--- a/data/gui/data_form_window.ui
+++ b/data/gui/data_form_window.ui
@@ -34,7 +34,7 @@
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
-                          <object class="GtkLabel" id="instructions_label">
+                          <object class="GtkLabel" id="title_label">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="wrap">True</property>
@@ -47,7 +47,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHSeparator" id="hseparator15">
+                          <object class="GtkHSeparator" id="title_hseparator">
                             <property name="visible">True</property>
                           </object>
                           <packing>
@@ -65,7 +65,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHSeparator" id="hseparator14">
+                      <object class="GtkHSeparator" id="config_hseparator">
                         <property name="visible">True</property>
                       </object>
                       <packing>
diff --git a/src/config.py b/src/config.py
index 0c77aa2a1..a59d688f8 100644
--- a/src/config.py
+++ b/src/config.py
@@ -2740,9 +2740,21 @@ class GroupchatConfigWindow:
             sw = self.data_form_widget.xml.get_object(
                 'single_form_scrolledwindow')
             sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_NEVER)
+            if self.form.title:
+                self.xml.get_object('title_label').set_text(self.form.title)
+            else:
+                self.xml.get_object('title_hseparator').set_no_show_all(True)
+#                self.xml.get_object('title_hseparator').hide()
 
             self.data_form_widget.show()
             config_vbox.pack_start(self.data_form_widget)
+        else:
+            self.xml.get_object('title_label').set_no_show_all(True)
+            self.xml.get_object('title_label').hide()
+            self.xml.get_object('title_hseparator').set_no_show_all(True)
+            self.xml.get_object('title_hseparator').hide()
+            self.xml.get_object('config_hseparator').set_no_show_all(True)
+            self.xml.get_object('config_hseparator').hide()
 
         # Draw the edit affiliation list things
         add_on_vbox = self.xml.get_object('add_on_vbox')