diff --git a/converse.js b/converse.js
index d25ef09ec..2fc684ce5 100644
--- a/converse.js
+++ b/converse.js
@@ -2420,8 +2420,8 @@
                 _.each($fields, function (field) {
                     $form.append(utils.xForm2webForm($(field), $stanza));
                 });
-                $form.append('<input type="submit" value="'+__('Save')+'"/>');
-                $form.append('<input type="button" value="'+__('Cancel')+'"/>');
+                $form.append('<input type="submit" class="save-submit" value="'+__('Save')+'"/>');
+                $form.append('<input type="button" class="cancel-submit" value="'+__('Cancel')+'"/>');
                 $form.on('submit', $.proxy(this.saveConfiguration, this));
                 $form.find('input[type=button]').on('click', $.proxy(this.cancelConfiguration, this));
             },
diff --git a/css/converse.css b/css/converse.css
index 729e89bf8..e43057752 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -923,11 +923,6 @@ dl.add-converse-contact {
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
 }
-#conversejs .chatroom-form {
-  background: white;
-  font-size: 12px;
-  padding: 10px 5px;
-}
 #conversejs .chat-body p {
   font-size: 14px;
   color: #666;
@@ -937,7 +932,7 @@ dl.add-converse-contact {
 #conversejs .chatroom-form legend {
   font-size: 14px;
   font-weight: bold;
-  margin-bottom: 5px;
+  margin: 5px 0;
 }
 #conversejs .chatroom-form label {
   height: 30px;
@@ -1129,6 +1124,7 @@ dl.add-converse-contact {
 #conversejs .chatroom {
   width: 300px;
 }
+#conversejs .chatroom-form,
 #conversejs .controlbox-pane {
   text-align: center;
   background-color: white;
@@ -1164,6 +1160,10 @@ dl.add-converse-contact {
   color: gray;
   font-size: 85%;
 }
+#conversejs .chatroom-form .instructions {
+  color: gray;
+  font-size: 95%;
+}
 #conversejs .form-help:hover,
 #conversejs #converse-register .instructions:hover {
   color: #4f4f4f;
@@ -1198,19 +1198,31 @@ dl.add-converse-contact {
   width: 100%;
 }
 #conversejs #converse-register .cancel,
+#conversejs .chatroom-form .cancel-submit,
 #conversejs #converse-register .cancel-submit {
   color: darkred;
 }
+#conversejs .chatroom-form .save-submit,
 #conversejs #converse-register .save-submit {
   color: darkgreen;
 }
+#conversejs .chatroom-form .save-submit,
+#conversejs .chatroom-form .cancel-submit,
 #conversejs #converse-register .cancel-submit,
 #conversejs #converse-register .save-submit {
   width: 45%;
-  margin: 5px 3px 0 3px;
+  margin: 5px 3px 5px 3px;
 }
+#conversejs .chatroom-form input {
+  width: 80%;
+  padding: 5px;
+  text-align: center;
+}
+#conversejs .chatroom-form label,
 #conversejs #converse-register label,
 #conversejs #converse-login label {
+  height: auto;
+  font-size: 14px;
   margin-top: 0.5em;
   font-weight: bold;
 }
diff --git a/less/converse.less b/less/converse.less
index fbecff76e..58477432b 100644
--- a/less/converse.less
+++ b/less/converse.less
@@ -1028,12 +1028,6 @@ dl.add-converse-contact {
     border-bottom-left-radius: 4px;
 }
 
-#conversejs .chatroom-form {
-    background: white;
-    font-size: 12px;
-    padding: 10px 5px;
-}
-
 #conversejs .chat-body p {
     font-size: 14px;
     color: #666;
@@ -1044,7 +1038,7 @@ dl.add-converse-contact {
 #conversejs .chatroom-form legend {
     font-size: 14px;
     font-weight: bold;
-    margin-bottom: 5px;
+    margin: 5px 0;
 }
 
 #conversejs .chatroom-form label {
@@ -1274,6 +1268,7 @@ dl.add-converse-contact {
     width: 300px;
 }
 
+#conversejs .chatroom-form,
 #conversejs .controlbox-pane {
     text-align: center;
     background-color: white;
@@ -1315,6 +1310,11 @@ dl.add-converse-contact {
     font-size: 85%;
 }
 
+#conversejs .chatroom-form .instructions {
+    color: gray;
+    font-size: 95%;
+}
+
 #conversejs .form-help:hover,
 #conversejs #converse-register .instructions:hover {
     color: #4f4f4f;
@@ -1357,22 +1357,35 @@ dl.add-converse-contact {
 }
 
 #conversejs #converse-register .cancel,
+#conversejs .chatroom-form .cancel-submit,
 #conversejs #converse-register .cancel-submit {
     color: darkred;
 }
 
+#conversejs .chatroom-form .save-submit,
 #conversejs #converse-register .save-submit {
     color: darkgreen;
 }
 
+#conversejs .chatroom-form .save-submit,
+#conversejs .chatroom-form .cancel-submit,
 #conversejs #converse-register .cancel-submit,
 #conversejs #converse-register .save-submit {
     width: 45%;
-    margin: 5px 3px 0 3px;
+    margin: 5px 3px 5px 3px;
 }
 
+#conversejs .chatroom-form input {
+    width: 80%;
+    padding: 5px;
+    text-align: center;
+}
+
+#conversejs .chatroom-form label,
 #conversejs #converse-register label,
 #conversejs #converse-login label {
+    height: auto;
+    font-size: 14px;
     margin-top: 0.5em;
     font-weight: bold;
 }