gistfile1.txt

diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua
--- a/util/sasl_cyrus.lua
+++ b/util/sasl_cyrus.lua
@@ -97,6 +97,9 @@
 	local data;
 
 	if self.mechanism then
+		if self.mechanism == "PLAIN" then
+			message = (message or ""):match("(%z.*)");
+		end
 		err, data = cyrussasl.server_start(self.cyrus, self.mechanism, message or "")
 	else
 		err, data = cyrussasl.server_step(self.cyrus, message or "")
@@ -105,6 +108,9 @@
 	self.username = cyrussasl.get_username(self.cyrus)
 
 	if (err == 0) then -- SASL_OK
+		if not self.username and self.mechanism == "PLAIN" then
+			self.username = message:match("%z(.*)%z");
+		end
 	   return "success", data
 	elseif (err == 1) then -- SASL_CONTINUE
 	   return "challenge", data