diff --git a/src/main/java/net/knarcraft/stargate/portal/PortalActivator.java b/src/main/java/net/knarcraft/stargate/portal/PortalActivator.java
index 0e52d66..3397e81 100644
--- a/src/main/java/net/knarcraft/stargate/portal/PortalActivator.java
+++ b/src/main/java/net/knarcraft/stargate/portal/PortalActivator.java
@@ -98,7 +98,7 @@ public class PortalActivator {
      * @param destination <p>The new destination of this portal activator's portal</p>
      */
     public void setDestination(Portal destination) {
-        setDestination(destination.getCleanName());
+        setDestination(destination.getName());
     }
 
     /**
diff --git a/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java b/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java
index 6133a89..cb59c04 100644
--- a/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java
+++ b/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java
@@ -257,7 +257,8 @@ public class PortalSignDrawer {
             setLine(sign, 2, highlightColor + "(" + mainColor + fixColor(portal.getNetwork()) +
                     highlightColor + ")");
         }
-        Portal destination = PortalHandler.getByName(portal.getDestinationName(), portal.getNetwork());
+        Portal destination = PortalHandler.getByName(Portal.cleanString(portal.getDestinationName()), 
+                portal.getNetwork());
         if (destination == null && !portal.getOptions().isRandom()) {
             setLine(sign, 3, errorColor + Stargate.getString("signDisconnected"));
         } else {