Index: easycwmp-1.1.6/src/xml.c
===================================================================
--- easycwmp-1.1.6.orig/src/xml.c
+++ easycwmp-1.1.6/src/xml.c
@@ -1316,7 +1316,12 @@ static int xml_handle_download(mxml_node
 		if (b && b->type == MXML_ELEMENT &&
 			!strcmp(b->value.element.name, "Username") &&
 			!b->child) {
-			username = "";
+			if (config->acs->username != NULL) {
+				username = config->acs->username;
+			}
+			else {
+				username = "";
+			}
 		}
 		if (b && b->type == MXML_TEXT &&
 			b->value.text.string &&
@@ -1327,7 +1332,12 @@ static int xml_handle_download(mxml_node
 		if (b && b->type == MXML_ELEMENT &&
 			!strcmp(b->value.element.name, "Password") &&
 			!b->child) {
-			password = "";
+			if (config->acs->password != NULL) {
+				password = config->acs->password;
+			}
+			else {
+				password = "";
+			}
 		}
 		if (b && b->type == MXML_TEXT &&
 			b->value.text.string &&