diff --git a/portal.go b/portal.go
index 124060e..3fa8258 100644
--- a/portal.go
+++ b/portal.go
@@ -644,11 +644,11 @@ func (portal *Portal) handleDiscordMessageUpdate(user *User, msg *discordgo.Mess
 	if msg.Flags == discordgo.MessageFlagsHasThread {
 		portal.bridge.GetThreadByID(msg.ID, existing)
 		portal.log.Debugfln("Marked %s as a thread root", msg.ID)
-		// TODO make autojoining optional
-		err := user.Session.ThreadJoinWithLocation(msg.ID, discordgo.ThreadJoinLocationContextMenu)
-		if err != nil {
-			user.log.Warnfln("Error autojoining thread %s@%s: %v", msg.ChannelID, portal.Key.ChannelID, err)
-		}
+		// TODO make autojoining configurable
+		//err := user.Session.ThreadJoinWithLocation(msg.ID, discordgo.ThreadJoinLocationContextMenu)
+		//if err != nil {
+		//	user.log.Warnfln("Error autojoining thread %s@%s: %v", msg.ChannelID, portal.Key.ChannelID, err)
+		//}
 	}
 
 	// There's a few scenarios where the author is nil but I haven't figured
@@ -665,7 +665,7 @@ func (portal *Portal) handleDiscordMessageUpdate(user *User, msg *discordgo.Mess
 			return
 		}
 
-		portal.log.Errorfln("author is nil: %#v", msg)
+		//portal.log.Errorfln("author is nil: %#v", msg)
 		return
 	}
 
diff --git a/user.go b/user.go
index 375fca8..242bd72 100644
--- a/user.go
+++ b/user.go
@@ -290,7 +290,7 @@ func (user *User) getSpaceRoom(ptr *id.RoomID, checked *bool, name, topic string
 		} else {
 			*ptr = resp.RoomID
 			user.Update()
-			user.ensureInvited(user.bridge.Bot, *ptr, false)
+			user.ensureInvited(nil, *ptr, false)
 
 			if parent != "" {
 				_, err = user.bridge.Bot.SendStateEvent(parent, event.StateSpaceChild, resp.RoomID.String(), &event.SpaceChildEventContent{
@@ -303,7 +303,7 @@ func (user *User) getSpaceRoom(ptr *id.RoomID, checked *bool, name, topic string
 			}
 		}
 	} else if !*checked && !user.bridge.StateStore.IsInRoom(*ptr, user.MXID) {
-		user.ensureInvited(user.bridge.Bot, *ptr, false)
+		user.ensureInvited(nil, *ptr, false)
 	}
 	*checked = true