diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
index 16d912c64..111f5ce37 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
@@ -42,7 +42,9 @@ public class Party {
 
     public Party(final com.arsdigita.kernel.Party trunkParty) {
         this.partyId = trunkParty.getID().longValue();
-        this.name = trunkParty.getName();
+        this.name = trunkParty.getName().
+                replace(" ", "_").
+                replace(".", "_");
 
         this.roleMemberships = new HashSet<>();