diff --git a/files/helpers/regex.py b/files/helpers/regex.py
index bda6fb306..16e4d1014 100644
--- a/files/helpers/regex.py
+++ b/files/helpers/regex.py
@@ -11,8 +11,8 @@ valid_username_patron_regex = re.compile("^[\w-]{1,25}$", flags=re.A)
 mention_regex = re.compile('(?<![:/\w])@([\w-]{1,30})' + NOT_IN_CODE_OR_LINKS, flags=re.A)
 group_mention_regex = re.compile('(?<![:/\w])!([\w-]{3,25})' + NOT_IN_CODE_OR_LINKS, flags=re.A|re.I)
 
-chat_adding_regex = re.compile('\+@[\w-]{1,30}' + NOT_IN_CODE_OR_LINKS, flags=re.A)
-chat_kicking_regex = re.compile('\-@[\w-]{1,30}' + NOT_IN_CODE_OR_LINKS, flags=re.A)
+chat_adding_regex = re.compile('\+@([\w-]{1,30})' + NOT_IN_CODE_OR_LINKS, flags=re.A)
+chat_kicking_regex = re.compile('\-@([\w-]{1,30})' + NOT_IN_CODE_OR_LINKS, flags=re.A)
 
 everyone_regex = re.compile('(^|\s|>)!(everyone)' + NOT_IN_CODE_OR_LINKS, flags=re.A)
 
diff --git a/files/routes/chat.py b/files/routes/chat.py
index d6dece974..1092027e9 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -155,8 +155,8 @@ def speak(data, v):
 		g.db.flush()
 
 		if v.id == chat.owner_id:
-			if chat_adding_regex.fullmatch(text):
-				user = get_user(text[2:], graceful=True, attributes=[User.id])
+			for i in chat_adding_regex.finditer(text):
+				user = get_user(i.group(1), graceful=True, attributes=[User.id])
 				if user and not user.has_muted(v) and not user.has_blocked(v):
 					existing = g.db.query(ChatMembership.user_id).filter_by(user_id=user.id, chat_id=chat_id).one_or_none()
 					leave = g.db.query(ChatLeave.user_id).filter_by(user_id=user.id, chat_id=chat_id).one_or_none()
@@ -167,8 +167,9 @@ def speak(data, v):
 						)
 						g.db.add(chat_membership)
 						g.db.flush()
-			elif chat_kicking_regex.fullmatch(text):
-				user = get_user(text[2:], graceful=True, attributes=[User.id])
+
+			for i in chat_kicking_regex.finditer(text):
+				user = get_user(i.group(1), graceful=True, attributes=[User.id])
 				if user:
 					existing = g.db.query(ChatMembership).filter_by(user_id=user.id, chat_id=chat_id).one_or_none()
 					if existing: