diff --git a/public/modules/groups/controllers/groups.client.controller.js b/public/modules/groups/controllers/groups.client.controller.js
index f32b334d..e5206f37 100644
--- a/public/modules/groups/controllers/groups.client.controller.js
+++ b/public/modules/groups/controllers/groups.client.controller.js
@@ -484,11 +484,11 @@ angular.module('groups').controller('GroupsController', ['$scope', '$stateParams
                     urlWithoutPort = url.url.substr(pos, url.url.length);
                     if (!urlWithoutPort) urlWithoutPort = '';
                 }
-                var portMapping = _.where(container.ports, { 'internal': parseInt(portInContainer) });
+                var portMapping = _.where(container.ports, { 'internal': parseInt(portInContainer), 'host': '' });
                 var portExternal = '';
                 if (portMapping && portMapping.length > 0) portExternal = ':' + portMapping[0].external;
 
-                if (!container.daemon) {
+                if (!container.daemon || portExternal === '') {
                     url.urlCompute = '';
                 } else {
                     url.urlCompute = 'http://' + container.daemon.host + portExternal + urlWithoutPort;
diff --git a/public/modules/groups/views/view-container.client.view.html b/public/modules/groups/views/view-container.client.view.html
index 60bd9635..1af8080e 100644
--- a/public/modules/groups/views/view-container.client.view.html
+++ b/public/modules/groups/views/view-container.client.view.html
@@ -117,9 +117,9 @@ <h3>
     <h4 ng-hide="group.isSSO">Urls</h4>
 
     <div ng-hide="group.isSSO || container.urls.length > 0" class="label label-info">No url attached to this service.</div>
-    <div ng-hide="group.isSSO" ng-repeat="url in container.urls">
+    <div ng-repeat="url in container.urls">
         <md-button class="md-accent md-hue-3" href={{url.urlCompute}}>
-            <i class="fa fa-link"></i> {{url.label}}
+            <em class="fa fa-link"></em> {{url.label}}
         </md-button>
     </div>