diff --git a/src/lib/Gateway/Endpoint.php b/src/lib/Gateway/Endpoint.php
index 6e93a8a7..1153442c 100644
--- a/src/lib/Gateway/Endpoint.php
+++ b/src/lib/Gateway/Endpoint.php
@@ -95,9 +95,7 @@ public function __construct(array $properties = [])
      */
     public function getIdentifier()
     {
-        $authorization = (!empty($this->user) ? "{$this->user}:{$this->pass}@" : '');
-
-        return "{$authorization}{$this->host}:{$this->port}{$this->path}/{$this->core}";
+        return "{$this->host}:{$this->port}{$this->path}/{$this->core}";
     }
 
     /**
@@ -107,7 +105,9 @@ public function getIdentifier()
      */
     public function getURL()
     {
-        return "{$this->scheme}://" . $this->getIdentifier();
+        $authorization = (!empty($this->user) ? "{$this->user}:{$this->pass}@" : '');
+
+        return "{$this->scheme}://" . $authorization . $this->getIdentifier();
     }
 }