diff --git a/SoarCraft.AwaiShop/AdminHub/Order/Export.cs b/SoarCraft.AwaiShop/AdminHub/Order/Export.cs
index 00b1ff01..cd9aaab9 100644
--- a/SoarCraft.AwaiShop/AdminHub/Order/Export.cs
+++ b/SoarCraft.AwaiShop/AdminHub/Order/Export.cs
@@ -182,7 +182,7 @@ public async IAsyncEnumerable<byte[]> ExportOrder() {
                 data.AddRange([
                     new() {
                         DataType = CellValues.SharedString,
-                        CellValue = new(shared(user.Name))
+                        CellValue = new(shared($"{user.Surname}, {user.Forename}"))
                     },
                     new() {
                         DataType = CellValues.SharedString,
@@ -207,7 +207,7 @@ public async IAsyncEnumerable<byte[]> ExportOrder() {
                                 prev.Append('[');
                                 prev.Append(curr.CreateAt.ToString("yyyy-MM-dd HH:mm"));
                                 prev.Append("] : ");
-                                prev.AppendLine(curr.User?.Name ?? "User");
+                                prev.AppendLine(curr.User?.Forename ?? "User");
                                 prev.AppendLine(curr.Content);
 
                                 return prev;
diff --git a/SoarCraft.AwaiShop/AdminHub/User/Entity.cs b/SoarCraft.AwaiShop/AdminHub/User/Entity.cs
index 73a83b5d..f005b1f8 100644
--- a/SoarCraft.AwaiShop/AdminHub/User/Entity.cs
+++ b/SoarCraft.AwaiShop/AdminHub/User/Entity.cs
@@ -21,7 +21,8 @@ internal partial class AdminHub {
         return await this.Db.Users
             .Where(x => x.UserId == key)
             .Select(x => new {
-                x.Name,
+                x.Surname,
+                x.Forename,
                 x.EMail,
                 x.Phone,
                 x.Address,
diff --git a/SoarCraft.AwaiShop/Helpers/DataSeeder.cs b/SoarCraft.AwaiShop/Helpers/DataSeeder.cs
index 57902ce9..d053c7d0 100644
--- a/SoarCraft.AwaiShop/Helpers/DataSeeder.cs
+++ b/SoarCraft.AwaiShop/Helpers/DataSeeder.cs
@@ -16,7 +16,8 @@ public static async Task SeedData(IApplicationBuilder host) {
 
         var user = context.Users.Add(new() {
             UserId = Guid.Parse("171B20BE-E180-410D-AAE2-EE28773AA0B7"),
-            Name = "Aloento",
+            Surname = "Aloento",
+            Forename = "Soar",
             EMail = "me@example.com",
             Phone = "+1 300000000",
             Address = "Address, Address",
diff --git a/SoarCraft.AwaiShop/Hub/Order/Entity.cs b/SoarCraft.AwaiShop/Hub/Order/Entity.cs
index 39c31d37..00b554aa 100644
--- a/SoarCraft.AwaiShop/Hub/Order/Entity.cs
+++ b/SoarCraft.AwaiShop/Hub/Order/Entity.cs
@@ -35,7 +35,7 @@ public async Task<dynamic> OrderEntity(uint key, uint? version) {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 0.1.1
+     * @version 0.2.0
      * </remarks>
      */
     [Authorize]
@@ -49,9 +49,10 @@ public async Task<dynamic> OrderEntity(uint key, uint? version) {
 
         return await this.Db.Comments
             .Where(x => x.CommentId == key && x.Order.UserId == this.UserId)
+            .Include(x => x.User)
             .Select(x => new {
                 x.Content,
-                x.User!.Name,
+                x.User!.Forename,
                 x.CreateAt,
                 x.Version
             })
diff --git a/SoarCraft.AwaiShop/Hub/User/Get.cs b/SoarCraft.AwaiShop/Hub/User/Get.cs
index 318fd590..3dfbe583 100644
--- a/SoarCraft.AwaiShop/Hub/User/Get.cs
+++ b/SoarCraft.AwaiShop/Hub/User/Get.cs
@@ -8,7 +8,7 @@ internal partial class ShopHub {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 0.1.1
+     * @version 0.2.0
      * </remarks>
      */
     [Authorize]
@@ -26,7 +26,8 @@ internal partial class ShopHub {
         return await this.Db.Users
             .Where(x => x.UserId == this.UserId)
             .Select(x => new {
-                x.Name,
+                x.Surname,
+                x.Forename,
                 x.EMail,
                 x.Phone,
                 x.Address,
diff --git a/SoarCraft.AwaiShop/Hub/User/Persona.cs b/SoarCraft.AwaiShop/Hub/User/Persona.cs
index a64fb12a..608d96ed 100644
--- a/SoarCraft.AwaiShop/Hub/User/Persona.cs
+++ b/SoarCraft.AwaiShop/Hub/User/Persona.cs
@@ -6,13 +6,17 @@ namespace SoarCraft.AwaiShop.Hub;
  * <remarks>
  * @author Aloento
  * @since 0.1.0
- * @version 0.1.0
+ * @version 0.2.0
  * </remarks>
  */
 internal class Persona {
     [Required]
-    [StringLength(50, MinimumLength = 2)]
-    public string? Name { get; set; }
+    [StringLength(20, MinimumLength = 2)]
+    public string? Surname { get; set; }
+
+    [Required]
+    [StringLength(20, MinimumLength = 2)]
+    public string? Forename { get; set; }
 
     [Required]
     [Phone]
diff --git a/SoarCraft.AwaiShop/Hub/User/Post.cs b/SoarCraft.AwaiShop/Hub/User/Post.cs
index efe61af4..2d139771 100644
--- a/SoarCraft.AwaiShop/Hub/User/Post.cs
+++ b/SoarCraft.AwaiShop/Hub/User/Post.cs
@@ -12,7 +12,7 @@ internal partial class ShopHub {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 0.1.2
+     * @version 0.2.0
      * </remarks>
      */
     [Authorize]
@@ -38,7 +38,8 @@ public async Task<bool> UserPostUpdate(Persona req) {
 
             await this.Db.Users.AddAsync(new() {
                 UserId = this.UserId,
-                Name = req.Name!,
+                Surname = req.Surname!,
+                Forename = req.Forename!,
                 EMail = req.EMail!,
                 Phone = req.Phone!,
                 Address = req.Address!
@@ -46,14 +47,15 @@ await this.Db.Users.AddAsync(new() {
             var row1 = await this.Db.SaveChangesAsync();
 
             this.Context.Items.Remove("NewUser");
-            this.Logger.NewUser(req.Name, this.Context);
+            this.Logger.NewUser($"{req.Surname}, {req.Forename}", this.Context);
             return row1 > 0;
         }
 
         var row = await this.Db.Users
             .Where(x => x.UserId == this.UserId)
             .ExecuteUpdateAsync(x => x
-                .SetProperty(u => u.Name, req.Name!)
+                .SetProperty(u => u.Surname, req.Surname!)
+                .SetProperty(u => u.Forename, req.Forename!)
                 .SetProperty(u => u.EMail, req.EMail!)
                 .SetProperty(u => u.Phone, req.Phone!)
                 .SetProperty(u => u.Address, req.Address!)
diff --git a/SoarCraft.AwaiShop/Migrations/20240301205204_Init.Designer.cs b/SoarCraft.AwaiShop/Migrations/20240304123656_Init.Designer.cs
similarity index 98%
rename from SoarCraft.AwaiShop/Migrations/20240301205204_Init.Designer.cs
rename to SoarCraft.AwaiShop/Migrations/20240304123656_Init.Designer.cs
index ff1c22de..532b6737 100644
--- a/SoarCraft.AwaiShop/Migrations/20240301205204_Init.Designer.cs
+++ b/SoarCraft.AwaiShop/Migrations/20240304123656_Init.Designer.cs
@@ -12,7 +12,7 @@
 namespace SoarCraft.AwaiShop.Migrations
 {
     [DbContext(typeof(ShopContext))]
-    [Migration("20240301205204_Init")]
+    [Migration("20240304123656_Init")]
     partial class Init
     {
         /// <inheritdoc />
@@ -356,16 +356,21 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("character varying(100)");
 
-                    b.Property<string>("Name")
+                    b.Property<string>("Forename")
                         .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
 
                     b.Property<string>("Phone")
                         .IsRequired()
                         .HasMaxLength(15)
                         .HasColumnType("character varying(15)");
 
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
+
                     b.Property<uint>("Version")
                         .IsConcurrencyToken()
                         .ValueGeneratedOnAddOrUpdate()
diff --git a/SoarCraft.AwaiShop/Migrations/20240301205204_Init.cs b/SoarCraft.AwaiShop/Migrations/20240304123656_Init.cs
similarity index 98%
rename from SoarCraft.AwaiShop/Migrations/20240301205204_Init.cs
rename to SoarCraft.AwaiShop/Migrations/20240304123656_Init.cs
index ecc72a43..52083519 100644
--- a/SoarCraft.AwaiShop/Migrations/20240301205204_Init.cs
+++ b/SoarCraft.AwaiShop/Migrations/20240304123656_Init.cs
@@ -47,7 +47,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     UserId = table.Column<Guid>(type: "uuid", nullable: false),
-                    Name = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
+                    Surname = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
+                    Forename = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
                     EMail = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: false),
                     Phone = table.Column<string>(type: "character varying(15)", maxLength: 15, nullable: false),
                     Address = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: false),
diff --git a/SoarCraft.AwaiShop/Migrations/ShopContextModelSnapshot.cs b/SoarCraft.AwaiShop/Migrations/ShopContextModelSnapshot.cs
index fbdf607d..3533e392 100644
--- a/SoarCraft.AwaiShop/Migrations/ShopContextModelSnapshot.cs
+++ b/SoarCraft.AwaiShop/Migrations/ShopContextModelSnapshot.cs
@@ -353,16 +353,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("character varying(100)");
 
-                    b.Property<string>("Name")
+                    b.Property<string>("Forename")
                         .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
 
                     b.Property<string>("Phone")
                         .IsRequired()
                         .HasMaxLength(15)
                         .HasColumnType("character varying(15)");
 
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
+
                     b.Property<uint>("Version")
                         .IsConcurrencyToken()
                         .ValueGeneratedOnAddOrUpdate()
diff --git a/SoarCraft.AwaiShop/Models/User.cs b/SoarCraft.AwaiShop/Models/User.cs
index 1e3c5b5a..32fe5bb9 100644
--- a/SoarCraft.AwaiShop/Models/User.cs
+++ b/SoarCraft.AwaiShop/Models/User.cs
@@ -8,15 +8,18 @@
  * <remarks>
  * @author Aloento
  * @since 0.1.0
- * @version 0.1.0
+ * @version 1.0.0
  * </remarks>
  */
 [Index(nameof(EMail), IsUnique = true)]
 public class User : Concurrency {
     public Guid UserId { get; set; }
 
-    [StringLength(50, MinimumLength = 2)]
-    public required string Name { get; set; }
+    [StringLength(20, MinimumLength = 2)]
+    public required string Surname { get; set; }
+
+    [StringLength(20, MinimumLength = 2)]
+    public required string Forename { get; set; }
 
     [EmailAddress]
     [StringLength(100, MinimumLength = 6)]
diff --git a/src/Components/Order/Info.tsx b/src/Components/Order/Info.tsx
index dd167f0c..b869318d 100644
--- a/src/Components/Order/Info.tsx
+++ b/src/Components/Order/Info.tsx
@@ -52,7 +52,7 @@ export function OrderInfo({ OrderId, Admin, ParentLog }: IOrderComp) {
     <div className={style.flex}>
       <div className={style.box}>
         <Field label="Name" size="large">
-          <Label>{data?.Name}</Label>
+          <Label>{data?.Surname}, {data?.Forename}</Label>
         </Field>
       </div>
 
diff --git a/src/Components/Setting.tsx b/src/Components/Setting.tsx
index 415a9f7c..39240d4f 100644
--- a/src/Components/Setting.tsx
+++ b/src/Components/Setting.tsx
@@ -1,5 +1,5 @@
 import { useMsal } from "@azure/msal-react";
-import { Button, Dialog, DialogActions, DialogBody, DialogContent, DialogSurface, DialogTitle, DialogTrigger, Field, Input, Label, Toast, ToastBody, ToastTitle, Tooltip, makeStyles, tokens } from "@fluentui/react-components";
+import { Button, Dialog, DialogActions, DialogBody, DialogContent, DialogSurface, DialogTitle, DialogTrigger, Field, Input, Toast, ToastBody, ToastTitle, Tooltip, makeStyles, tokens } from "@fluentui/react-components";
 import { useEffect, useState } from "react";
 import { Logger } from "~/Helpers/Logger";
 import { ColFlex, Flex } from "~/Helpers/Styles";
@@ -39,13 +39,15 @@ const log = new Logger("Setting");
 /**
  * @author Aloento
  * @since 0.1.0
- * @version 0.7.0
+ * @version 0.8.0
  */
 export function Setting({ Open, Toggle, New }: ISetting) {
   const style = useStyles();
   const claim = useMsal().instance.getActiveAccount();
 
-  const [name, setName] = useState<string>();
+  const [surname, setSurname] = useState<string>();
+  const [forename, setForename] = useState<string>();
+
   const [phone, setPhone] = useState<string>();
   const [address, setAddress] = useState<string>();
 
@@ -54,9 +56,10 @@ export function Setting({ Open, Toggle, New }: ISetting) {
   useEffect(() => {
     if (New || !data) return;
 
-    const { Name, Phone, Address } = data;
+    const { Surname, Forename, Phone, Address } = data;
 
-    setName(Name);
+    setSurname(Surname);
+    setForename(Forename);
     setPhone(Phone);
     setAddress(Address);
   }, [data]);
@@ -82,7 +85,7 @@ export function Setting({ Open, Toggle, New }: ISetting) {
         <Toast>
           <ToastTitle>Info {New ? "Created" : "Updated"}</ToastTitle>
           <ToastBody>
-            {req.Name}
+            {req.Surname}, {req.Forename}
             <br />
             {req.Phone}
             <br />
@@ -111,17 +114,29 @@ export function Setting({ Open, Toggle, New }: ISetting) {
           <DialogContent className={style.box}>
             <div className={style.one}>
               <Tooltip
-                content="Full first and family names, will be used to the shipping label."
+                content="Surname, for shipping label"
                 relationship="description"
                 withArrow
               >
-                <Field label="Name" size="large" required>
-                  <Input size="medium" value={name} maxLength={20} onChange={(_, v) => setName(v.value)} />
+                <Field label="Family Name" size="large" required>
+                  <Input size="medium" value={surname} maxLength={20} onChange={(_, v) => setSurname(v.value)} />
                 </Field>
               </Tooltip>
 
               <Tooltip
-                content="Up to 20 digits, starting with an internation access code."
+                content="Forename, for shipping label"
+                relationship="description"
+                withArrow
+              >
+                <Field label="Given Name" size="large" required>
+                  <Input size="medium" value={forename} maxLength={20} onChange={(_, v) => setForename(v.value)} />
+                </Field>
+              </Tooltip>
+            </div>
+
+            <div className={style.one}>
+              <Tooltip
+                content="Up to 20 digits, starting with an internation access code"
                 relationship="description"
                 withArrow
               >
@@ -129,14 +144,20 @@ export function Setting({ Open, Toggle, New }: ISetting) {
                   <Input size="medium" value={phone} maxLength={20} onChange={(_, v) => setPhone(v.value)} />
                 </Field>
               </Tooltip>
-            </div>
 
-            <Field label="E-Mail" size="large">
-              <Label>{claim?.username}</Label>
-            </Field>
+              <Tooltip
+                content={`Your company email, ${claim?.username}`}
+                relationship="description"
+                withArrow
+              >
+                <Field label="E-Mail" size="large">
+                  <Input size="medium" value={claim?.username} disabled />
+                </Field>
+              </Tooltip>
+            </div>
 
             <Tooltip
-              content="Your full shipping address including street, number, ZIP, town and country. Separate lines by commas."
+              content="Your full shipping address including street, number, ZIP, town and country. Separate lines by commas"
               relationship="description"
               withArrow
             >
@@ -155,7 +176,8 @@ export function Setting({ Open, Toggle, New }: ISetting) {
 
             <Button appearance="primary" onClick={() => run({
               EMail: claim?.username,
-              Name: name,
+              Surname: surname,
+              Forename: forename,
               Address: address,
               Phone: phone
             })}>
diff --git a/src/Components/ShopCart/Confirm.tsx b/src/Components/ShopCart/Confirm.tsx
index 640dfa33..38dccfe0 100644
--- a/src/Components/ShopCart/Confirm.tsx
+++ b/src/Components/ShopCart/Confirm.tsx
@@ -1,11 +1,12 @@
-import { Button, Field, Textarea, Toast, ToastBody, ToastTitle, makeStyles, tokens } from "@fluentui/react-components";
+import { Badge, Button, DialogBody, DialogContent, DialogSurface, DialogTitle, Field, Textarea, makeStyles, tokens } from "@fluentui/react-components";
 import { Drawer, DrawerBody, DrawerHeader, DrawerHeaderTitle } from "@fluentui/react-components/unstable";
 import { useConst } from "@fluentui/react-hooks";
 import { DismissRegular } from "@fluentui/react-icons";
+import { CheckmarkFilled } from "@fluentui/react-icons/lib/fonts";
 import { useBoolean } from "ahooks";
 import { useState } from "react";
 import { Logger } from "~/Helpers/Logger";
-import { ColFlex } from "~/Helpers/Styles";
+import { ColFlex, Flex } from "~/Helpers/Styles";
 import { useErrorToast } from "~/Helpers/useToast";
 import { Hub } from "~/ShopNet";
 import { DelegateDataGrid } from "../DataGrid";
@@ -17,7 +18,7 @@ import { PersonaInfo } from "./Persona";
 /**
  * @author Aloento
  * @since 0.5.0
- * @version 0.1.0
+ * @version 0.2.0
  */
 const useStyles = makeStyles({
   body: {
@@ -27,6 +28,11 @@ const useStyles = makeStyles({
   sub: {
     width: "fit-content",
     alignSelf: "flex-end"
+  },
+  title: {
+    ...Flex,
+    alignItems: "center",
+    columnGap: tokens.spacingHorizontalM,
   }
 });
 
@@ -35,7 +41,7 @@ const log = new Logger("TopNavBar", "ShopCart", "Confirm");
 /**
  * @author Aloento
  * @since 0.1.0
- * @version 0.4.2
+ * @version 0.5.0
  */
 export function Confirm() {
   const [cmt, setCmt] = useState<string>();
@@ -58,16 +64,34 @@ export function Confirm() {
     },
     onSuccess(data) {
       dispatchToast(
-        <Toast>
-          <ToastTitle>Order Placed</ToastTitle>
-          <ToastBody>Order Id: {data}</ToastBody>
-        </Toast>,
-        { intent: "success" }
+        <DialogSurface>
+          <DialogBody>
+            <DialogTitle className={style.title}>
+              <Badge size="large" color="success" icon={<CheckmarkFilled />} />
+              Thank You!
+            </DialogTitle>
+
+            <DialogContent>
+              Your order {data} has been placed and is being processed.
+              <br /><br />
+              You can click Avatar -{">"} History to view details,
+              <br />
+              send us an additional comment or even cancel it.
+              <br /><br />
+              You will now be taken to your order details.
+            </DialogContent>
+          </DialogBody>
+        </DialogSurface>,
+        {
+          onStatusChange(_, toast) {
+            if (toast.status === "unmounted")
+              Nav("History", data);
+          },
+        }
       );
 
-      Update([]);
       toggle();
-      Nav("History", data);
+      Update([]);
     },
   });
 
diff --git a/src/Components/ShopCart/Persona.tsx b/src/Components/ShopCart/Persona.tsx
index 20887683..a1d09a86 100644
--- a/src/Components/ShopCart/Persona.tsx
+++ b/src/Components/ShopCart/Persona.tsx
@@ -21,10 +21,11 @@ const useStyles = makeStyles({
 /**
  * @author Aloento
  * @since 0.5.0
- * @version 0.1.0
+ * @version 0.2.0
  */
 export interface IPersona {
-  Name: string;
+  Surname: string;
+  Forename: string;
   Phone: string;
   EMail: string;
   Address: string;
@@ -33,7 +34,7 @@ export interface IPersona {
 /**
  * @author Aloento
  * @since 0.5.0
- * @version 0.2.1
+ * @version 0.3.0
  */
 export function PersonaInfo({ Log }: { Log: Logger }) {
   const style = useStyles();
@@ -44,7 +45,7 @@ export function PersonaInfo({ Log }: { Log: Logger }) {
     <div className={style.person}>
       <div className={style.inf}>
         <Field label="Name" size="large">
-          <Label>{data?.Name}</Label>
+          <Label>{data?.Surname}, {data?.Forename}</Label>
         </Field>
       </div>
 
diff --git a/src/ShopNet/Admin/Order/Get.ts b/src/ShopNet/Admin/Order/Get.ts
index 7dfca6ea..e3011a79 100644
--- a/src/ShopNet/Admin/Order/Get.ts
+++ b/src/ShopNet/Admin/Order/Get.ts
@@ -79,7 +79,7 @@ export abstract class AdminOrderGet extends AdminNet {
         Status: order.Status,
         TrackNumber: order.TrackingNumber,
         OrderDate: order.CreateAt,
-        User: user.Name,
+        User: user.Forename,
       });
     }
 
diff --git a/src/ShopNet/Admin/User/Entity.ts b/src/ShopNet/Admin/User/Entity.ts
index 8981a616..ee3c1a0f 100644
--- a/src/ShopNet/Admin/User/Entity.ts
+++ b/src/ShopNet/Admin/User/Entity.ts
@@ -10,15 +10,16 @@ export abstract class AdminUserEntity extends AdminNet {
   /**
    * @author Aloento
    * @since 1.0.0
-   * @version 0.1.0
+   * @version 0.2.0
    */
   public static User(key: string): Promise<({
-    Name: string;
+    Surname: string;
+    Forename: string;
     EMail: string;
     Phone: string;
     Address: string;
     Admin?: boolean;
-  } & IConcurrency) | void> {
+  } & IConcurrency)> {
     this.EnsureLogin();
     return this.GetVersionCache(key, "UserEntity");
   }
diff --git a/src/ShopNet/Admin/User/Get.ts b/src/ShopNet/Admin/User/Get.ts
index 04ac1aee..ef5a668d 100644
--- a/src/ShopNet/Admin/User/Get.ts
+++ b/src/ShopNet/Admin/User/Get.ts
@@ -48,7 +48,7 @@ export abstract class AdminUserGet extends AdminNet {
 
       res.push({
         Id: userId,
-        Name: user.Name,
+        Name: `${user.Surname}, ${user.Forename}`,
         EMail: user.EMail,
         Admin: user.Admin,
       });
diff --git a/src/ShopNet/Order/Entity.ts b/src/ShopNet/Order/Entity.ts
index 5d7551d5..435bc369 100644
--- a/src/ShopNet/Order/Entity.ts
+++ b/src/ShopNet/Order/Entity.ts
@@ -10,7 +10,7 @@ export namespace OrderEntity {
 
   export type Comment = {
     Content: string;
-    Name?: string;
+    Forename?: string;
     CreateAt: Date;
   } & IConcurrency;
 }
diff --git a/src/ShopNet/Order/Get.ts b/src/ShopNet/Order/Get.ts
index fba22087..a65786ff 100644
--- a/src/ShopNet/Order/Get.ts
+++ b/src/ShopNet/Order/Get.ts
@@ -206,7 +206,7 @@ export abstract class OrderGet extends OrderEntity {
             const user = await AdminUserEntity.User(cmt.UserId);
 
             if (user)
-              name = user.Name;
+              name = user.Forename;
             else
               log.warn(`[Mismatch] User ${cmt.UserId} not found. Order : ${orderId}`);
           }
@@ -229,7 +229,7 @@ export abstract class OrderGet extends OrderEntity {
           comments.push({
             Content: cmt.Content,
             Time: cmt.CreateAt,
-            User: cmt.Name || "You"
+            User: cmt.Forename || "You"
           });
         }