diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index c39888b1..094b8866 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -36,8 +36,8 @@ else
 				<th style="width: 1px;">&nbsp;</th>
 				<th style="width: 1px;">&nbsp;</th>
 				<th style="width: 1px;">&nbsp;</th>
-				<th>@SharedLocalizer["Name"]</th>
 				<th>@SharedLocalizer["Username"]</th>
+				<th>@SharedLocalizer["Email"]</th>
 				<th>@Localizer["LastLoginOn"]</th>
 				<th>@Localizer["LastIPAddress"]</th>
 				<th>@Localizer["CreatedOn"]</th>
@@ -52,11 +52,11 @@ else
 					<td>
 						<ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
 					</td>
-					<td>@context.User.DisplayName</td>
 					<td>@context.User.Username</td>
-					<td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}",context.User.LastLoginOn)</td>
+					<td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.DisplayName, @context.User.Email))</td>
+					<td>@string.Format("{0:dd-MMM-yyyy HH:mm}",context.User.LastLoginOn)</td>
                     <td>@context.User.LastIPAddress</td>
-                    <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}",context.User.CreatedOn)</td>
+                    <td>@string.Format("{0:dd-MMM-yyyy HH:mm}",context.User.CreatedOn)</td>
 
 				</Row>
 			</Pager>