--- a/plugins/mod_saslauth.lua	Mon Jan 17 16:50:21 2011 +0100
+++ b/plugins/mod_saslauth.lua	Mon Jan 17 16:50:21 2011 +0100
@@ -246,6 +246,10 @@
 			return;
 		end
 		origin.sasl_handler = usermanager_get_sasl_handler(module.host);
+		
+		if origin.secure then
+			origin.sasl_handler["userdata"] = origin.conn:socket();
+		end
 		features:tag("mechanisms", mechanisms_attr);
 		for mechanism in pairs(origin.sasl_handler:mechanisms()) do
 			if mechanism ~= "PLAIN" or origin.secure or allow_unencrypted_plain_auth then