diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index 7a0ba6ef351f39c6042113b2b195cc19fcb7ea22..080eb14271041883e24511a7a44b00b95b1a3e7b 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -551,7 +551,7 @@ class AuthHandler(BaseHandler):
                     qualified_user_id, password,
                 )
                 if is_valid:
-                    defer.returnValue(qualified_user_id)
+                    defer.returnValue((qualified_user_id, None))
 
             if (not hasattr(provider, "get_supported_login_types")
                     or not hasattr(provider, "check_auth")):