diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index 480f2bdf52..75329a0848 100644
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -514,8 +514,13 @@ static switch_status_t chat_send(const char *proto, const char *from, const char
 				from = hint;
 			} else {
 				char *p;
-				ffrom = switch_mprintf("%s+%s", proto, from);
-				from = ffrom;
+				
+				if (!(profile->user_flags & LDL_FLAG_COMPONENT)) {
+					from = ffrom = strdup(profile->login);
+				} else {
+					from = ffrom = switch_mprintf("%s+%s", proto, from);
+				}
+				
 				if ((p = strchr(from, '/'))) {
 					*p = '\0';
 				}