diff --git a/lib/Gateway/Endpoint.php b/lib/Gateway/Endpoint.php
index 36067421..0b9ec389 100644
--- a/lib/Gateway/Endpoint.php
+++ b/lib/Gateway/Endpoint.php
@@ -99,9 +99,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}";
     }
 
     /**
@@ -111,6 +109,8 @@ 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();
     }
 }