diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js
index 1d780ebae..86e6509b3 100644
--- a/src/converse-muc-views.js
+++ b/src/converse-muc-views.js
@@ -1106,7 +1106,7 @@ export const ChatRoomView = ChatBoxView.extend({
         const tmp_result = tpl_muc_nickname_form(this.model.get('nick'));
         if (api.settings.get('muc_show_logs_before_join')) {
             const container = this.el.querySelector('.muc-bottom-panel');
-            render(container, tmp_result);
+            render(tmp_result, container);
             u.addClass('muc-bottom-panel--nickname', container);
         } else {
             const form = this.el.querySelector('.muc-nickname-form');
diff --git a/src/templates/list_chatrooms_modal.js b/src/templates/list_chatrooms_modal.js
index 58fed850c..6c2c907ac 100644
--- a/src/templates/list_chatrooms_modal.js
+++ b/src/templates/list_chatrooms_modal.js
@@ -15,7 +15,7 @@ const form = (o) => {
                 <label for="chatroom">${i18n_server_address}:</label>
                 <input type="text"
                     @change=${o.setDomainFromEvent}
-                    value="${o.muc_domain}"
+                    value="${o.muc_domain || ''}"
                     required="required"
                     name="server"
                     class="form-control"
diff --git a/src/templates/muc_nickname_form.js b/src/templates/muc_nickname_form.js
index dff75b498..c9fe16c0c 100644
--- a/src/templates/muc_nickname_form.js
+++ b/src/templates/muc_nickname_form.js
@@ -15,7 +15,7 @@ export default (nickname) => {
             <form class="converse-form chatroom-form converse-centered-form">
                 <fieldset class="form-group">
                     <label>${i18n_heading}</label>
-                    <input type="text" required="required" name="nick" value="${nickname}"
+                    <input type="text" required="required" name="nick" value="${nickname || ''}"
                         class="form-control" placeholder="${i18n_nickname}"/>
                 </fieldset>
                 <fieldset class="form-group">