diff --git a/src/server_events.c b/src/server_events.c
index c8fe2a84..a9c6c6e6 100644
--- a/src/server_events.c
+++ b/src/server_events.c
@@ -526,7 +526,7 @@ handle_room_configure(const char * const room, DataForm *form)
                 cons_show("      Label: %s", option->label);
             }
             if (option->value != NULL) {
-                cons_show("      Value: %s", option->value);
+                cons_show("        Value: %s", option->value);
             }
 
             curr_option = g_slist_next(curr_option);
diff --git a/src/xmpp/form.c b/src/xmpp/form.c
index ca798c29..43eb7503 100644
--- a/src/xmpp/form.c
+++ b/src/xmpp/form.c
@@ -167,8 +167,9 @@ form_create(xmpp_stanza_t * const form_stanza)
 
             // handle repeated field children
             xmpp_stanza_t *field_child = xmpp_stanza_get_children(field_stanza);
-            child_name = xmpp_stanza_get_name(field_child);
             while (field_child != NULL) {
+                child_name = xmpp_stanza_get_name(field_child);
+
                 // handle values
                 if (g_strcmp0(child_name, "value") == 0) {
                     char *value = xmpp_stanza_get_text(field_child);