diff --git a/Extensions/MSALAuthentication.psm1 b/Extensions/MSALAuthentication.psm1
index 5eb049b..b040b85 100644
--- a/Extensions/MSALAuthentication.psm1
+++ b/Extensions/MSALAuthentication.psm1
@@ -259,6 +259,7 @@ function Get-MSALUserInfo
         if($global:Organization)
         {
             if($global:Organization -is [array]) { $global:Organization = $global:Organization[0]}
+            $global:Organization.displayName = ($global:Organization.displayName).Trim()
             Save-Setting $global:Organization.Id "_Name" $global:Organization.displayName
         }
         Set-EnvironmentInfo $global:Organization.displayName
diff --git a/Extensions/MSGraph.psm1 b/Extensions/MSGraph.psm1
index 65815de..0b07e62 100644
--- a/Extensions/MSGraph.psm1
+++ b/Extensions/MSGraph.psm1
@@ -2708,7 +2708,7 @@ function Get-GraphMigrationTableFile
 
     if($global:chkAddCompanyName.IsChecked)
     {
-        $path = Join-Path $path ($global:organization.displayName).Trim()
+        $path = Join-Path $path $global:organization.displayName
     }
     $path
 }
@@ -4263,7 +4263,7 @@ function Get-GraphObjectFolder
 
     $path = $rootFolder
 
-    if($addOrganization) { $path = Join-Path $path ($global:organization.displayName).Trim() }
+    if($addOrganization) { $path = Join-Path $path $global:organization.displayName }
 
     if($addObjectType -and $objectType.Id) { $path = Join-Path $path $objectType.Id }