diff --git a/pkg/js/helpers.js b/pkg/js/helpers.js
index 3029cecb4..4989b8ef9 100644
--- a/pkg/js/helpers.js
+++ b/pkg/js/helpers.js
@@ -1850,7 +1850,7 @@ function M365_BUILDER(name, value) {
             );
         }
 
-        value.domainGUID = name.replace('.', '-');
+        value.domainGUID = name.replace(/\./g, '-');
     }
 
     if (value.dkim && !value.initialDomain) {