--- a/util/jid.lua	Sun Sep 27 00:36:34 2015 +0200
+++ b/util/jid.lua	Fri Oct 02 12:12:24 2015 +0200
@@ -36,7 +36,11 @@
 end
 
 local function bare(jid)
-	return jid and match(jid, "^[^/]+");
+	local node, host = _split(jid);
+	if node and host then
+		return node.."@"..host;
+	end
+	return host;
 end
 
 local function prepped_split(jid)