diff --git a/LesionTracker/defaultSettings.js b/LesionTracker/defaultSettings.js
index d37d40756..3d4ad2e10 100644
--- a/LesionTracker/defaultSettings.js
+++ b/LesionTracker/defaultSettings.js
@@ -9,9 +9,6 @@ Meteor.startup(function() {
         dicomWeb: {
             endpoints: [{
                 name: 'Orthanc',
-                host: 'localhost',
-                port: '8042',
-                aeTitle: 'Orthanc',
                 wadoUriRootNOTE: 'either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently',
                 wadoUriRoot: 'http://localhost:8043/wado',
                 qidoRoot: 'http://localhost:8042/dicom-web',
diff --git a/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.js b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.js
index 829e62717..beb449252 100644
--- a/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.js
+++ b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.js
@@ -1,9 +1,23 @@
+
+function parseUrl(url) {
+    var parser = document.createElement('a');
+    parser.href = url;
+    return parser;
+}
+
 Template.serverInformationModal.helpers({
     serverInformation: function() {
         var defaultServiceType = Meteor.settings && Meteor.settings.defaultServiceType || 'dicomWeb';
         var serviceInfo = Meteor.settings[defaultServiceType];
         if (defaultServiceType === 'dicomWeb') {
-            serviceInfo = serviceInfo["endpoints"];
+            var serverInformationDicom = [];
+            var endpoints = serviceInfo["endpoints"];
+            endpoints.forEach(function(endpoint) {
+                var parsedUrl = parseUrl(endpoint.qidoRoot);
+                serverInformationDicom.push({host: parsedUrl.hostname, port: parsedUrl.port, aeTitle: endpoint.name});
+            });
+
+            return serverInformationDicom;
         }
         return serviceInfo;
     }