diff --git a/src/ui/pages/profile/ManageProfile.page.tsx b/src/ui/pages/profile/ManageProfile.page.tsx
index c7c9e88f..f9328da3 100644
--- a/src/ui/pages/profile/ManageProfile.page.tsx
+++ b/src/ui/pages/profile/ManageProfile.page.tsx
@@ -31,7 +31,9 @@ export const ManageProfilePage: React.FC = () => {
     const normalizedName = transformCommaSeperatedName(enhanced.displayName || '');
     const extractedFirstName = enhanced.givenName || normalizedName.split(' ')[0];
     let extractedLastName = enhanced.surname || normalizedName.split(' ')[1];
-    extractedLastName = extractedLastName.slice(1, extractedLastName.length);
+    if (!enhanced.surname) {
+      extractedLastName = extractedLastName.slice(1, extractedLastName.length);
+    }
     return {
       ...enhanced,
       displayName: normalizedName,