diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index 06394f1..e77e7f0 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,3 +1,5 @@
+2009-01-12 P. A. Bagyenda <bagyenda@dsmagic.com>
+	* Minor fixes: Output from admin interfaces always valid XML
 2008-12-24 P. A. Bagyenda <bagyenda@dsmagic.com>
 	* Improved MM1 performance
 2008-12-17 P. A. Bagyenda <bagyenda@dsmagic.com>
diff --git a/mbuni/mmsbox/mmsbox_cfg.c b/mbuni/mmsbox/mmsbox_cfg.c
index 79484f2..9fd9cc8 100644
--- a/mbuni/mmsbox/mmsbox_cfg.c
+++ b/mbuni/mmsbox/mmsbox_cfg.c
@@ -657,7 +657,7 @@ MmscGrp *start_mmsc_from_conf(mCfg *cfg, mCfgGrp *x, gwthread_func_t *mmsc_handl
      /* finally start the thingie. */
      mmsbox_start_mmsc_conn(m, mmsc_handler_func, errors, warnings);
      if (dict_put_once(mmscs, m->id, m) == 0) {
-	  WARNING("Failed to load mmsc <%s>. ID is not unique!", octstr_get_cstr(m->id));
+	  WARNING("Failed to load mmsc [%s]. ID is not unique!", octstr_get_cstr(m->id));
 	  mmsbox_stop_mmsc_conn_real(m);
 	  free_mmsc_struct(m);
 	  m = NULL;
@@ -991,7 +991,7 @@ static void admin_handler(void *unused)
 		     flg ? "Invalid/empty password" : "IP not allowed");
 	       if (flg) {/* means it is allowed by IP */
 		    rstatus = HTTP_UNAUTHORIZED;
-		    rbody = octstr_imm("Auth failed");
+		    rbody = octstr_imm("<error>Auth failed</error>");
 	       }
 	  } else {
 	       Octstr *mmc_id = http_cgi_variable(cgivars, "mmsc-id");	       
diff --git a/mbuni/mmsc/mmsc_cfg.c b/mbuni/mmsc/mmsc_cfg.c
index caac48d..b5e5457 100644
--- a/mbuni/mmsc/mmsc_cfg.c
+++ b/mbuni/mmsc/mmsc_cfg.c
@@ -521,7 +521,7 @@ MmsVasp *mmsc_load_vasp_from_conf(MmscSettings *m, mCfgGrp *grp, List *errors, L
      mv->stats.start_time = time(NULL);
 
      if (dict_put_once(m->vasp_list, mv->id, mv) == 0) {
-	  ERROR("Failed to load vasp <%S>. ID is not unique!", mv->id);
+	  ERROR("Failed to load vasp [%S]. ID is not unique!", mv->id);
 	  free_vasp(mv);
      } else 
 	  ret = mv;
@@ -964,7 +964,7 @@ static void admin_handler(MmscSettings *settings)
 			 flg ? "Invalid/empty password" : "IP not allowed");
 	       if (flg) {/* means it is allowed by IP */
 		    rstatus = HTTP_UNAUTHORIZED;
-		    rbody = octstr_imm("Auth failed");
+		    rbody = octstr_imm("<error>Auth failed</error>");
 	       }
 	  } else {
 	       Octstr *vasp_id = http_cgi_variable(cgivars, "vasp-id");