diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCE.java
index d299747c1d..ed6ac80ee8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCE.java
@@ -4,4 +4,6 @@ import reactor.core.publisher.Mono;
 
 public interface WorkspaceServiceHelperCE {
     Mono<Boolean> isCreateWorkspaceAllowed(Boolean isDefaultWorkspace);
+
+    Mono<String> generateDefaultWorkspaceName(String firstName);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCEImpl.java
index e579ba4456..10387e7724 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCEImpl.java
@@ -14,4 +14,10 @@ public class WorkspaceServiceHelperCEImpl implements WorkspaceServiceHelperCE {
     public Mono<Boolean> isCreateWorkspaceAllowed(Boolean isDefaultWorkspace) {
         return Mono.just(TRUE);
     }
+
+    @Override
+    public Mono<String> generateDefaultWorkspaceName(String firstName) {
+        // Default implementation returns "x's apps"
+        return Mono.just(firstName + "'s apps");
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java
index e1d4b60727..2a062ee494 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java
@@ -123,9 +123,13 @@ public class WorkspaceServiceCEImpl extends BaseService<WorkspaceRepository, Wor
      */
     @Override
     public Mono<Workspace> createDefault(final Workspace workspace, User user) {
-        workspace.setName(user.computeFirstName() + "'s apps");
-        workspace.setIsAutoGeneratedWorkspace(true);
-        return create(workspace, user, TRUE);
+        return workspaceServiceHelper
+                .generateDefaultWorkspaceName(user.computeFirstName())
+                .flatMap(name -> {
+                    workspace.setName(name);
+                    workspace.setIsAutoGeneratedWorkspace(true);
+                    return create(workspace, user, TRUE);
+                });
     }
 
     /**