1 files changed, 3 insertions(+), 2 deletions(-)

M src/bridge/bridge.cpp

@@ 999,8 999,9 @@ void Bridge::send_user_join(const std::string& hostname, const std::string& chan
 
   std::string full_jid =
       encoded_nick_name + utils::empty_if_fixed_server("%" + hostname)
-      + "@" + this->xmpp.get_served_hostname()
-      + "/" + user->host;
+      + "@" + this->xmpp.get_served_hostname();
+  if (user->host.empty())
+    full_jid += "/" + user->host;
 
   this->xmpp.send_user_join(encoded_chan_name + utils::empty_if_fixed_server("%" + hostname),
                             user->nick, full_jid, affiliation, role,