diff --git a/client/scheduler_op.C b/client/scheduler_op.C
index 5037833a4f..0be17f9e1d 100644
--- a/client/scheduler_op.C
+++ b/client/scheduler_op.C
@@ -335,7 +335,7 @@ bool SCHEDULER_OP::poll() {
     vector<STRING256> urls;
     bool changed, scheduler_op_done;
     bool action = false, err = false;
-    char err_msg[256],*err_url=NULL;
+    char err_msg[256], *err_url=NULL;
 
     ScopeMessages scope_messages(log_messages, ClientMessages::DEBUG_SCHED_OP);
 
@@ -576,11 +576,11 @@ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
             // Do nothing
         } else if (match_tag(buf, "</scheduler_reply>")) return 0;
         else if (parse_str(buf, "<project_name>", project_name, sizeof(project_name))) continue;
-        else if (parse_str(buf, "<user_name>", user_name, sizeof(user_name))) continue;
+		else if (parse_str(buf, "<user_name>", user_name, sizeof(user_name))) continue;
         else if (parse_double(buf, "<user_total_credit>", user_total_credit)) continue;
         else if (parse_double(buf, "<user_expavg_credit>", user_expavg_credit)) continue;
         else if (parse_int(buf, "<user_create_time>", (int &)user_create_time)) continue;
-        else if (parse_str(buf, "<team_name>", team_name, sizeof(team_name))) continue;
+		else if (parse_str(buf, "<team_name>", team_name, sizeof(team_name))) continue;
         else if (parse_int(buf, "<hostid>", hostid)) continue;
         else if (parse_double(buf, "<host_total_credit>", host_total_credit)) continue;
         else if (parse_double(buf, "<host_expavg_credit>", host_expavg_credit)) continue;
diff --git a/lib/app_ipc.C b/lib/app_ipc.C
index 8fa4fe6eb0..259426d0f7 100755
--- a/lib/app_ipc.C
+++ b/lib/app_ipc.C
@@ -36,6 +36,7 @@ char* xml_graphics_modes[NGRAPHICS_MODES] = {
 #define REREAD_PREFS_MSG "<reread_prefs/>"
 
 int write_init_data_file(FILE* f, APP_INIT_DATA& ai) {
+	string str1, str2;
     if (strlen(ai.app_name)) {
         fprintf(f, "<app_name>%s</app_name>\n", ai.app_name);
     }
@@ -43,10 +44,14 @@ int write_init_data_file(FILE* f, APP_INIT_DATA& ai) {
         fprintf(f, "<app_preferences>\n%s</app_preferences>\n", ai.app_preferences);
     }
     if (strlen(ai.team_name)) {
-        fprintf(f, "<team_name>%s</team_name>\n", ai.team_name);
+		str1 = ai.team_name;
+		xml_escape(str1, str2);
+        fprintf(f, "<team_name>%s</team_name>\n", str2.c_str());
     }
     if (strlen(ai.user_name)) {
-        fprintf(f, "<user_name>%s</user_name>\n", ai.user_name);
+		str1 = ai.user_name;
+		xml_escape(str1, str2);
+        fprintf(f, "<user_name>%s</user_name>\n", str2.c_str());
     }
     if (strlen(ai.comm_obj_name)) {
         fprintf(f, "<comm_obj_name>%s</comm_obj_name>\n", ai.comm_obj_name);