diff --git a/converse.js b/converse.js
index 7ac385dd2..930e6bb33 100644
--- a/converse.js
+++ b/converse.js
@@ -1760,6 +1760,7 @@
                     this.$el.html(
                         converse.templates.room_panel({
                             'server_input_type': converse.hide_muc_server && 'hidden' || 'text',
+                            'server_label_global_attr': converse.hide_muc_server && ' hidden' || '',
                             'label_room_name': __('Room name'),
                             'label_nickname': __('Nickname'),
                             'label_server': __('Server'),
diff --git a/src/templates/room_panel.html b/src/templates/room_panel.html
index 65ef62b39..907846e31 100644
--- a/src/templates/room_panel.html
+++ b/src/templates/room_panel.html
@@ -5,7 +5,7 @@
     <label>{{label_nickname}}</label>
     <input type="text" name="nick" class="new-chatroom-nick"
         placeholder="{{label_nickname}}"/>
-    <label>{{label_server}}</label>
+    <label{{server_label_global_attr}}>{{label_server}}</label>
     <input type="{{server_input_type}}" name="server" class="new-chatroom-server"
         placeholder="{{label_server}}"/>
     <div class="button-group">