diff --git a/src/main/java/venture/Aust1n46/chat/controllers/commands/Ignore.java b/src/main/java/venture/Aust1n46/chat/controllers/commands/Ignore.java
index f466882..c53a612 100644
--- a/src/main/java/venture/Aust1n46/chat/controllers/commands/Ignore.java
+++ b/src/main/java/venture/Aust1n46/chat/controllers/commands/Ignore.java
@@ -109,6 +109,6 @@ public class Ignore extends PlayerCommand {
 			Collections.sort(completions);
 			return completions;
 		}
-		return null;
+		return super.tabComplete(sender, alias, args);
 	}
 }
diff --git a/src/main/java/venture/Aust1n46/chat/controllers/commands/Message.java b/src/main/java/venture/Aust1n46/chat/controllers/commands/Message.java
index 696027a..ceafb54 100644
--- a/src/main/java/venture/Aust1n46/chat/controllers/commands/Message.java
+++ b/src/main/java/venture/Aust1n46/chat/controllers/commands/Message.java
@@ -166,7 +166,7 @@ public class Message extends PlayerCommand {
 			Collections.sort(completions);
 			return completions;
 		}
-		return null;
+		return super.tabComplete(sender, alias, args);
 	}
 
 	private void sendBungeeCordMessage(VentureChatPlayer mcp, String command, String[] args) {
diff --git a/src/main/java/venture/Aust1n46/chat/service/VentureChatFormatService.java b/src/main/java/venture/Aust1n46/chat/service/VentureChatFormatService.java
index bbb3ed5..34cc94f 100644
--- a/src/main/java/venture/Aust1n46/chat/service/VentureChatFormatService.java
+++ b/src/main/java/venture/Aust1n46/chat/service/VentureChatFormatService.java
@@ -159,7 +159,7 @@ public class VentureChatFormatService {
 		do {
 			Pattern pattern = Pattern.compile(
 					"([a-zA-Z0-9" + BUKKIT_COLOR_CODE_PREFIX + "\\-:/]+\\.[a-zA-Z/0-9" + BUKKIT_COLOR_CODE_PREFIX
-							+ "\\-:_#]+(\\.[a-zA-Z/0-9." + BUKKIT_COLOR_CODE_PREFIX + "\\-:#\\?\\+=_]+)?)");
+							+ "\\-:_#]+(\\.[a-zA-Z/0-9." + BUKKIT_COLOR_CODE_PREFIX + "\\-:;,#\\?\\+=_]+)?)");
 			Matcher matcher = pattern.matcher(remaining);
 			if (matcher.find()) {
 				indexLink = matcher.start();