diff --git a/commands/edit-image-text/tweet.js b/commands/edit-image-text/tweet.js
index d9e8fa94..20e938a5 100644
--- a/commands/edit-image-text/tweet.js
+++ b/commands/edit-image-text/tweet.js
@@ -292,7 +292,25 @@ module.exports = class TweetCommand extends Command {
 	}
 
 	async fetchUser(user) {
+		if (user === 'me') {
+		}
 		try {
+			const matches = val.match(/^(?:<@!?)?([0-9]+)>?$/);
+			if (matches) {
+				const user = await this.client.users.fetch(matches[1]);
+				if (!user) throw new Error('User not found');
+				const avaURL = user.displayAvatarURL({ extension: 'png', size: 64, forceStatic: true });
+				const avatarRes = await request.get(avaURL);
+				return {
+					screenName: user.username,
+					name: user.globalName || user.username,
+					avatar: avatarRes.body,
+					avatarShape: 'Circle',
+					checkType: null,
+					label: null,
+					followers: 5
+				};
+			}
 			const guestClient = await api.getGuestClient();
 			const { data } = await guestClient.getUserApi().getUserByScreenName({ screenName: user });
 			const body = data.user.legacy;