Fall back to 'username' if 'user' is not given for appservice reg.

1 files changed, 5 insertions, 3 deletions

diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py

index 7c6d2942dc..8da73a8615 100644
--- a/synapse/rest/client/v2_alpha/register.py
+++ b/synapse/rest/client/v2_alpha/register.py
@@ -134,9 +134,11 @@ class RegisterRestServlet(RestServlet):
             # fallback to 'username' if they gave one.
             if isinstance(body.get("user"), basestring):
                 desired_username = body["user"]
-            result = yield self._do_appservice_registration(
-                desired_username, request.args["access_token"][0]
-            )
+
+            if isinstance(desired_username, basestring):
+                result = yield self._do_appservice_registration(
+                    desired_username, request.args["access_token"][0]
+                )
             defer.returnValue((200, result))  # we throw for non 200 responses
             return