diff --git a/demo/start.sh b/demo/start.sh
index a7502e7a8d2f944c3cf1f7c0d8e6a9742964a1c2..bb2248770da122ad71985e9df599da805a36ee48 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -16,7 +16,7 @@ if [ $# -eq 1 ]; then
     fi
 fi
 
-for port in 8080; do
+for port in 8080 8081 8082; do
     echo "Starting server on port $port... "
 
     https_port=$((port + 400))
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index 0c17208cd38965388a7feff0db8492172dc15c51..a0ab9839a602774f62ef825a598b85db3343707b 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -80,7 +80,7 @@ class SyncRestServlet(RestServlet):
 
     @defer.inlineCallbacks
     def on_GET(self, request):
-        user = yield self.auth.get_user_by_req(request)
+        user, client = yield self.auth.get_user_by_req(request)
 
         timeout = self.parse_integer(request, "timeout", default=0)
         limit = self.parse_integer(request, "limit", required=True)