diff --git a/jarvis_tasks/tasks/twitter.py b/jarvis_tasks/tasks/twitter.py
index 90465e3..438e303 100644
--- a/jarvis_tasks/tasks/twitter.py
+++ b/jarvis_tasks/tasks/twitter.py
@@ -3,7 +3,6 @@ import asyncio
 from datetime import datetime, timedelta, timezone
 from logging import Logger
 from typing import List
-from urllib.parse import quote_plus
 
 import tweepy
 from dis_snek import Snake
@@ -24,7 +23,7 @@ def tweet_embeds(tweet: tweepy.models.Status) -> List[Embed]:
     Args:
         tweet: Tweet to build embed
     """
-    url = f"https://twitter.com/{quote_plus(tweet.user.name)}/status/{tweet.id}"
+    url = f"https://twitter.com/{tweet.user.screen_name}/status/{tweet.id}"
     entities = tweet.__dict__.get("extended_entities", {})
     media = entities.get("media", [])
 
@@ -36,7 +35,7 @@ def tweet_embeds(tweet: tweepy.models.Status) -> List[Embed]:
     text = tweet.text
     if subtweet := tweet.__dict__.get("quoted_status", None):
         subuser = subtweet.user
-        text += f"\n\n> [@{subuser.name}](https://twitter.com/{quote_plus(subuser.name)})"
+        text += f"\n\n> [@{subuser.name}](https://twitter.com/{subuser.screen_name})"
         text += f"\n> {subtweet.text}"
         if entites := subtweet.__dict__.get("extended_entities", {}):
             submedia = entites.get("media", [])