--- a/plugins/mod_s2s/mod_s2s.lua	Wed Jan 21 02:55:27 2015 +0100
+++ b/plugins/mod_s2s/mod_s2s.lua	Thu Mar 26 16:48:39 2015 +0000
@@ -499,6 +499,12 @@
 	if not from or (hosts[from] and hosts[from].modules.dialback) then
 		attr["xmlns:db"] = 'jabber:server:dialback';
 	end
+	if not from then
+		attr.from = '';
+	end
+	if not to then
+		attr.to = '';
+	end
 end
 
 -- Session initialization logic shared by incoming and outgoing