diff --git a/src/main/java/net/pingex/dcf/commands/permissions/PermissionsCommands.java b/src/main/java/net/pingex/dcf/commands/permissions/PermissionsCommands.java
index 94ecb06..54d7e58 100644
--- a/src/main/java/net/pingex/dcf/commands/permissions/PermissionsCommands.java
+++ b/src/main/java/net/pingex/dcf/commands/permissions/PermissionsCommands.java
@@ -41,7 +41,7 @@ public class PermissionsCommands implements IWithCommands
 	private static final Command permissionAudit = Command.builder("permissions:audit")
 			.aliases("perm:audit", "auditperm")
 			.description("Audits permissions status for an user to run a command.")
-			.usage("<command> <user#disc|uid|me> [serverid]")
+			.usage("<command> <user#disc|uid|me> [server|sid|*]")
 			.options(Collections.singleton(new DefaultPermissionOption(DefaultPermissionOption.Value.EVERYONE)))
 			.build(PermissionsCommands::permissionAuditImpl);
 
@@ -85,14 +85,18 @@ public class PermissionsCommands implements IWithCommands
 		}
 
 		// argchk#4 serverid
-		Optional<IGuild> targetGuild = Optional.empty();
+		Optional<IGuild> targetGuild = context.getGuild() != null ? Optional.of(context.getGuild()) : Optional.empty();
 		if(context.getArguments().size() == 3)
 		{
-			targetGuild = ArgumentParser.checkParseGuildOrID(context.getArguments().get(2), context.getClient());
-			if(!targetGuild.isPresent())
+			if(context.getArguments().get(2).equals("*")) targetGuild = Optional.empty();
+			else
 			{
-				DiscordInteractionsUtil.sendMessage(context.getChannel(), "Target guild not found.");
-				return;
+				targetGuild = ArgumentParser.checkParseGuildOrID(context.getArguments().get(2), context.getClient());
+				if(!targetGuild.isPresent())
+				{
+					DiscordInteractionsUtil.sendMessage(context.getChannel(), "Target guild not found.");
+					return;
+				}
 			}
 		}
 
@@ -113,7 +117,7 @@ public class PermissionsCommands implements IWithCommands
 		sb.append("\n\n");
 
 		// Result
-		sb.append("Audit Results\n")
+		sb.append("Audit results\n")
 				.append("=> OPCode:  ").append(result.getOpcode()).append("\n")
 				.append("=> Message: ").append(result.getMessage() != null ? result.getMessage() : "N/A").append("\n\n");