diff --git a/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor b/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor
index 55f49383..da294761 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor
@@ -38,10 +38,18 @@
 
 <div class="mt-3">
     <DataGrid @ref="Grid" TGridItem="UserDto" Loader="LoadAsync" PageSize="10" ClassName="bg-card">
-        <PropertyColumn HeadClassName="text-left" CellClassName="text-left" Field="u => u.Id"/>
-        <PropertyColumn HeadClassName="text-left" CellClassName="text-left" IsFilterable="true"
-                        Identifier="@nameof(UserDto.Username)" Field="u => u.Username"/>
-        <PropertyColumn HeadClassName="text-left" CellClassName="text-left" IsFilterable="true"
+        <PropertyColumn HeadClassName="text-left" Field="u => u.Id"/>
+        <TemplateColumn IsFilterable="true" Identifier="@nameof(UserDto.Username)" Title="Username">
+            <CellTemplate>
+                <TableCell>
+                    <a class="text-primary" href="#"
+                       @onclick="() => EditAsync(context)" @onclick:preventDefault>
+                        @context.Username
+                    </a>
+                </TableCell>
+            </CellTemplate>
+        </TemplateColumn>
+        <PropertyColumn HeadClassName="text-left" IsFilterable="true"
                         Identifier="@nameof(UserDto.Email)" Field="u => u.Email"/>
         <TemplateColumn>
             <CellTemplate>