diff --git a/payphone/db/utils.py b/payphone/db/utils.py
index 5768a3f..36ff59a 100644
--- a/payphone/db/utils.py
+++ b/payphone/db/utils.py
@@ -73,14 +73,13 @@ async def get_user(
         {"username": user.name}, id=user.id
     )
 
-    # TODO: Make per-server profiles a premium feature.
     profile_row, _ = await models.Profile.update_or_create(
         {
             "avatar_url": user.display_avatar.url,
-            "name": user.global_name or user.name,
+            "name": user.display_name or user.name,
         },
         user=user_row,
-        server_id=None,  # user.guild.id if isinstance(user, discord.Member) else None,
+        server_id=user.guild.id if isinstance(user, discord.Member) else None,
     )
 
     return (user_row, profile_row)