diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 2abefa28bdbd..b51666f0e86f 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -715,10 +715,11 @@ function clearDeleteWorkspaceError(policyID) {
 
 /**
  * Generate a policy name based on an email and policy list.
+ * @param {String} [email] the email to base the workspace name on. If not passed, will use the logged in user's email instead
  * @returns {String}
  */
-function generateDefaultWorkspaceName() {
-    const emailParts = sessionEmail.split('@');
+function generateDefaultWorkspaceName(email = '') {
+    const emailParts = email ? email.split('@') : sessionEmail.split('@');
     let defaultWorkspaceName = '';
     if (!emailParts || emailParts.length !== 2) {
         return defaultWorkspaceName;
@@ -769,7 +770,7 @@ function generatePolicyID() {
  */
 function createWorkspace(ownerEmail = '', makeMeAdmin = false) {
     const policyID = generatePolicyID();
-    const workspaceName = generateDefaultWorkspaceName();
+    const workspaceName = generateDefaultWorkspaceName(ownerEmail);
 
     const {
         announceChatReportID,