X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fserv_xmpp.c;h=2d8ef9d0fa42bbc95d0b780a343809953a4770b9;hp=e0b61af64413e38b7978d4b42d0f5388cd2ef71a;hb=2bcd29b7be1638c9b3038556a2f2eabd4b0e3af3;hpb=df8fe1be788cd4193b9e213009b665b47f1ed385

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index e0b61af64..2d8ef9d0f 100644
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -413,17 +413,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
 			}
 
 			/* Generate the "full JID" of the client resource */
-
-			if (IsEmptyStr(CC->cs_inet_email)) {				// synthetic user@host if no email is set
-				snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
-					"%ld@%s/%s", CC->user.usernum, CtdlGetConfigStr("c_fqdn"), XMPP->iq_client_resource
-				);
-			}
-			else {								// use the email address if we have it
-				snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
-					"%s/%s", CC->cs_inet_email, XMPP->iq_client_resource
-				);
-			}
+			snprintf(XMPP->client_jid, sizeof XMPP->client_jid, "%s/%s", CC->cs_inet_email, XMPP->iq_client_resource);
 
 			/* Tell the client what its JID is */