2 files changed, 6 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 2680678de7..bfc1ab86f2 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -114,7 +114,7 @@ class FederationHandler(BaseHandler):
 
         if event.type == RoomMemberEvent.TYPE:
             if event.membership == Membership.JOIN:
-                user = self.hs.parse_userid(event.target_user_id)
+                user = self.hs.parse_userid(event.state_key)
                 self.distributor.fire(
                     "user_joined_room", user=user, room_id=event.room_id
                 )
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index c2b10f4189..5a4569ac95 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -270,6 +270,10 @@ class MessageHandler(BaseHandler):
         # FIXME (erikj): We need to not generate this token,
         now_token = "%s_%s" % (now_rooms_token, now_presence_token)
 
+        limit = pagin_config.limit
+        if not limit:
+            limit = 10
+
         for event in room_list:
             d = {
                 "room_id": event.room_id,
@@ -286,7 +290,7 @@ class MessageHandler(BaseHandler):
             try:
                 messages, token = yield self.store.get_recent_events_for_room(
                     event.room_id,
-                    limit=10,
+                    limit=limit,
                     end_token=now_rooms_token,
                 )