diff --git a/src/Authentication.Abstractions/AzureEnvironment.BuiltIn.cs b/src/Authentication.Abstractions/AzureEnvironment.BuiltIn.cs
index d4218841a4..091db375bb 100644
--- a/src/Authentication.Abstractions/AzureEnvironment.BuiltIn.cs
+++ b/src/Authentication.Abstractions/AzureEnvironment.BuiltIn.cs
@@ -162,7 +162,9 @@ private static void SetExtendedProperties(IDictionary<string, AzureEnvironment>
                 azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzurePurviewEndpointResourceId, AzureEnvironmentConstants.AzurePurviewEndpointResourceId);
                 azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureAppConfigurationEndpointSuffix, AzureEnvironmentConstants.AzureAppConfigurationEndpointSuffix);
                 azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureAppConfigurationEndpointResourceId, AzureEnvironmentConstants.AzureAppConfigurationEndpointResourceId);
-                azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.ContainerRegistryEndpointResourceId, AzureEnvironmentConstants.AzureContainerRegistryEndpointResourceId);            
+                azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.ContainerRegistryEndpointResourceId, AzureEnvironmentConstants.AzureContainerRegistryEndpointResourceId);
+                azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureCommunicationEmailEndpointSuffix, AzureEnvironmentConstants.AzureCommunicationEmailEndpointSuffix);
+                azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureCommunicationEmailEndpointResourceId, AzureEnvironmentConstants.AzureCommunicationEmailEndpointResourceId);
             }
 
             if (azureEnvironments.ContainsKey(EnvironmentName.AzureChinaCloud))
diff --git a/src/Authentication.Abstractions/AzureEnvironment.cs b/src/Authentication.Abstractions/AzureEnvironment.cs
index 8b0b9e9f7d..ead7b60e7f 100644
--- a/src/Authentication.Abstractions/AzureEnvironment.cs
+++ b/src/Authentication.Abstractions/AzureEnvironment.cs
@@ -569,7 +569,9 @@ public static class ExtendedEndpoint
                 AzurePurviewEndpointResourceId = "AzurePurviewEndpointResourceId",
                 AzureAppConfigurationEndpointSuffix = "AzureAppConfigurationEndpointSuffix",
                 AzureAppConfigurationEndpointResourceId = "AzureAppConfigurationEndpointResourceId",
-                ContainerRegistryEndpointResourceId = "ContainerRegistryEndpointResourceId";
+                ContainerRegistryEndpointResourceId = "ContainerRegistryEndpointResourceId",
+                AzureCommunicationEmailEndpointSuffix = "AzureCommunicationEmailEndpointSuffix",
+                AzureCommunicationEmailEndpointResourceId = "AzureCommunicationEmailEndpointResourceId";
         }
     }
 }
diff --git a/src/Authentication.Abstractions/AzureEnvironmentConstants.cs b/src/Authentication.Abstractions/AzureEnvironmentConstants.cs
index 5d8d43ebf5..d4c5a7eadc 100644
--- a/src/Authentication.Abstractions/AzureEnvironmentConstants.cs
+++ b/src/Authentication.Abstractions/AzureEnvironmentConstants.cs
@@ -281,6 +281,10 @@ public static class AzureEnvironmentConstants
         public const string USGovernmentContainerRegistryEndpointResourceId = "https://management.usgovcloudapi.net";
         public const string AzureContainerRegistryEndpointResourceId = "https://management.azure.com";
 
-
+        /// <summary>
+        /// Communication Email
+        /// </summary>
+        public const string AzureCommunicationEmailEndpointSuffix = "communication.azure.com";
+        public const string AzureCommunicationEmailEndpointResourceId = "https://communication.azure.com";
     }
 }
diff --git a/src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs b/src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs
index d7cd61dc77..b2e327e192 100644
--- a/src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs
+++ b/src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs
@@ -321,7 +321,13 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
                         break;
                     case AzureEnvironment.ExtendedEndpoint.ContainerRegistryEndpointResourceId:
                         environment.SetProperty(AzureEnvironment.ExtendedEndpoint.ContainerRegistryEndpointResourceId, propertyValue);
-                        break;                        
+                        break;
+                    case AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointSuffix:
+                        environment.SetProperty(AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointSuffix, propertyValue);
+                        break;
+                    case AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointResourceId:
+                        environment.SetProperty(AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointResourceId, propertyValue);
+                        break;
                 }
             }
         }
@@ -385,7 +391,11 @@ public static string GetTokenAudience(this IAzureEnvironment environment, string
                     break;
                 case AzureEnvironment.ExtendedEndpoint.ContainerRegistryEndpointResourceId:
                     resource = AzureEnvironment.ExtendedEndpoint.ContainerRegistryEndpointResourceId;
-                    break;                    
+                    break;
+                case AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointSuffix:
+                case AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointResourceId:
+                    resource = AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointResourceId;
+                    break;
                 default:
                     resource = AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId;
                     break;