diff --git a/app/star_citizen.py b/app/star_citizen.py
index b1ed23c6..e5e72e46 100644
--- a/app/star_citizen.py
+++ b/app/star_citizen.py
@@ -61,12 +61,9 @@ async def rsi_find(player):
         description="-------",
         color=discord.Color.blue(),
         type="rich",
-        title="[%s's Star Citizen Information](%s)"
-        % (
-            response["data"]["profile"]["page"]["url"],
-            response["data"]["profile"]["handle"],
-        ),
+        title="%s's Star citizen information" % response["data"]["profile"]["handle"],
     )
+
     embed.add_field(
         name="Link to profile",
         value=response["data"]["profile"]["page"]["url"],
@@ -74,18 +71,19 @@ async def rsi_find(player):
     )
     embed.add_field(
         name="Enlisted",
-        value=response["data"]["profile"]["enlisted"],
+        value=response["data"]["profile"]["enlisted"].split("T")[0],
         inline=False,
     )
 
     embed.set_author(
         name=response["data"]["profile"]["badge"],
         icon_url=response["data"]["profile"]["badge_image"],
+        url=response["data"]["profile"]["page"]["url"],
     )
     embed.set_thumbnail(url=response["data"]["profile"]["image"])
 
     embed.add_field(name="-------", value="", inline=False)
-    if response["data"]["organization"]["name"]:
+    if "name" in response["data"]["organization"]:
         embed.add_field(
             name="Org Info",
             value=response["data"]["organization"]["name"],