diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.class.php
index 4be4706a..bc081211 100644
--- a/src/psm/Module/Server/Controller/ServerController.class.php
+++ b/src/psm/Module/Server/Controller/ServerController.class.php
@@ -101,9 +101,11 @@ class ServerController extends AbstractServerController {
 			if($servers[$x]['type'] == 'website') {
 				$servers[$x]['type_icon'] = 'icon-globe';
 				// add link to label
-				$servers[$x]['ip'] = '<a href="'.$servers[$x]['ip'].'" target="_blank">'.$servers[$x]['ip'].'</a>';				
+				$servers[$x]['ip'] = '<a href="'.$servers[$x]['ip'].'" target="_blank">'.$servers[$x]['ip'].'</a>';
+				$servers[$x]['ip_short'] = $servers[$x]['ip'];
 			} else {
 				$servers[$x]['type_icon'] = 'icon-cog';
+				$servers[$x]['ip_short'] = $servers[$x]['ip'] . ' : ' . $servers[$x]['port'];
 			}
 			if(($servers[$x]['active'] == 'yes')) {
 				$servers[$x]['active_icon'] = 'icon-eye-open';
@@ -116,7 +118,7 @@ class ServerController extends AbstractServerController {
 				$servers[$x]['email_icon'] = '';
 				$servers[$x]['sms_icon'] = '';
 			}
-					
+
 			$servers[$x] = $this->formatServer($servers[$x]);
 		}
 		// add servers to template
diff --git a/src/templates/server/server.tpl.html b/src/templates/server/server.tpl.html
index 4a4dd539..20c2a61e 100755
--- a/src/templates/server/server.tpl.html
+++ b/src/templates/server/server.tpl.html
@@ -22,7 +22,7 @@
 				<span class="label label-status-{status}"><a href="{url_view}" title="{error}">{status}</a></span>
 			</td>
 			<td class="hidden-phone"><a href="{url_view}">{label}</a></td>
-			<td class="nowrap visible-tablet"><i class="{type_icon}" title="{type}"></i> {ip} : {port}</td>
+			<td class="nowrap visible-tablet"><i class="{type_icon}" title="{type}"></i> {ip_short}</td>
 			<td class="nowrap visible-desktop">{ip}</td>
 			<td class="nowrap visible-desktop">{port}</td>
 			<td class="nowrap visible-desktop">{type}</td>
@@ -49,7 +49,7 @@
 				</div>
 				<div class="table-body">
 					<div class="table-row">
-						<div class="table-cell"><i class="{type_icon}" title="{type}"></i> {ip} : {port}</div>
+						<div class="table-cell"><i class="{type_icon}" title="{type}"></i> {ip_short}</div>
 						<div class="table-cell tight">
 							<i class="{active_icon}" title="{active_title}"></i> <i class="{email_icon}" title="{label_email}"></i> <i class="{sms_icon}" title="{label_sms}"></i>
 						</div>