diff --git a/src/commands/wryna.ts b/src/commands/wryna.ts
index 15856c3..c433e29 100644
--- a/src/commands/wryna.ts
+++ b/src/commands/wryna.ts
@@ -19,7 +19,7 @@ export class UserCommand extends Command {
 
 	// Message command
 	public async messageRun(message: Message, args: Args) {
-		return this.sendPing(message, args.getOption('nickname') || 'NOTHING');
+		return this.sendPing(message, args.getOption('nickname') || message.content.split('!wryna ')[1]);
 	}
 
 	// Chat Input (slash) command
@@ -32,9 +32,11 @@ export class UserCommand extends Command {
 		nickname: string
 	) {
 		interactionOrMessage instanceof Message
-			? await interactionOrMessage.channel.send({ content: `${nickname} was ${interactionOrMessage.author.tag}'s nickname in highschool!` })
+			? await interactionOrMessage.channel.send({
+					content: `${nickname} was ${interactionOrMessage.author.username}'s nickname in highschool!`
+			  })
 			: await interactionOrMessage.reply({
-					content: `${nickname} was ${interactionOrMessage.user.tag}'s nickname in highschool!`,
+					content: `${nickname} was ${interactionOrMessage.user.username}'s nickname in highschool!`,
 					fetchReply: true
 			  });
 	}