diff --git a/channels.c b/channels.c
index 4bda81c9..29f228cf 100644
--- a/channels.c
+++ b/channels.c
@@ -69,7 +69,7 @@ channel_group_find(const char *name, int create)
   
   TAILQ_INIT(&tcg->tcg_channels);
 
-  TAILQ_INSERT_HEAD(&all_channel_groups, tcg, tcg_global_link);
+  TAILQ_INSERT_TAIL(&all_channel_groups, tcg, tcg_global_link);
   return tcg;
 }
 
diff --git a/htmlui.c b/htmlui.c
index a7c35544..6ff41fd5 100644
--- a/htmlui.c
+++ b/htmlui.c
@@ -1255,19 +1255,6 @@ page_chgroups(http_connection_t *hc, const char *remain, void *opaque)
   top_menu(hc, &tq);
 
 
-  tcp_qprintf(&tq, "<form method=\"get\" action=\"/chgrp\">");
-
-  box_top(&tq, "box");
-  tcp_qprintf(&tq, "<div class=\"content3\">"
-	      "<input type=\"text\" name=\"newgrpname\"> "
-	      "<input type=\"submit\" name=\"newgrp\""
-	      " value=\"Add new group\">"
-	      "</div>");
-
-  box_bottom(&tq);
-  tcp_qprintf(&tq, "</form><br>\r\n");
-
-
   TAILQ_FOREACH(tcg, &all_channel_groups, tcg_global_link) {
 
     tcp_qprintf(&tq, "<form method=\"get\" action=\"/chgrp\">");
@@ -1295,6 +1282,20 @@ page_chgroups(http_connection_t *hc, const char *remain, void *opaque)
   }
 
 
+  tcp_qprintf(&tq, "<form method=\"get\" action=\"/chgrp\">");
+
+  box_top(&tq, "box");
+  tcp_qprintf(&tq, "<div class=\"content3\">"
+	      "<input type=\"text\" name=\"newgrpname\"> "
+	      "<input type=\"submit\" name=\"newgrp\""
+	      " value=\"Add new group\">"
+	      "</div>");
+
+  box_bottom(&tq);
+  tcp_qprintf(&tq, "</form><br>\r\n");
+
+
+
   http_output_queue(hc, &tq, "text/html; charset=UTF-8");
   return 0;
 }