diff --git a/CHANGES.rst b/CHANGES.rst
index a8b821a2d2cca81ab4e26695def45fcffe917c46..aff6688b934fe73ae5baf48acbd83166605f6144 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+Changes in synapse v0.25.1 (2017-11-17)
+=======================================
+
+Bug fixes:
+
+* Fix login with LDAP and other password provider modules (PR #2678). Thanks to
+  @jkolo!
+
 Changes in synapse v0.25.0 (2017-11-15)
 =======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e04208961f40a88279237868c5b5d2bc4d4f1654..8c3d7a210ab8099648f9c111ce83c218d921ddef 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.25.0"
+__version__ = "0.25.1"
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")):