diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index 7a0ba6ef351f..080eb1427104 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -551,7 +551,7 @@ def validate_login(self, username, login_submission):
                     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")):