diff --git a/events/joinMatchEvent.py b/events/joinMatchEvent.py
index 324beef..362fddc 100644
--- a/events/joinMatchEvent.py
+++ b/events/joinMatchEvent.py
@@ -25,10 +25,9 @@ def handle(userToken, packetData):
 		#	password = generalUtils.stringMd5(password)
 
 		# Check password
-		# TODO: Admins can enter every match
-		if match.matchPassword != "":
-			if match.matchPassword != password:
-				raise exceptions.matchWrongPasswordException
+		# Always send wrong password if this is a tourney match
+		if (match.matchPassword != "" and match.matchPassword != password) or match.isTourney:
+			raise exceptions.matchWrongPasswordException
 
 		# Password is correct, join match
 		userToken.joinMatch(matchID)
diff --git a/objects/osuToken.py b/objects/osuToken.py
index 176c13c..68471eb 100644
--- a/objects/osuToken.py
+++ b/objects/osuToken.py
@@ -308,6 +308,10 @@ class token:
 		chat.joinChannel(token=self, channel="#multi_{}".format(self.matchID))
 		self.enqueue(serverPackets.matchJoinSuccess(matchID))
 
+		# Alert the user if we have just joined a tourney match
+		if match.isTourney:
+			self.enqueue(serverPackets.notification("You are now in a tournament match."))
+
 	def leaveMatch(self):
 		"""
 		Leave joined match, match stream and match channel