diff --git a/org.adempiere.ui.zk/theme/default/login-left.zul b/org.adempiere.ui.zk/theme/default/login-left.zul
index 787cda76e2..42963b363f 100644
--- a/org.adempiere.ui.zk/theme/default/login-left.zul
+++ b/org.adempiere.ui.zk/theme/default/login-left.zul
@@ -9,7 +9,7 @@ Copyright (C) 2009 Idalica Corporation
 <?component name="loginLinks" inline="true" macroURI="login-links.zul"?>
 <div>
 	<vendorLogo/>
-	<loginInfo if="${desktop.execution.localName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.localName.startsWith(&quot;demo.&quot;)}"/>
+	<loginInfo if="${desktop.execution.serverName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.serverName.startsWith(&quot;demo.&quot;)}"/>
 	<versionInfo/>
 	<loginLinks/>
 </div>
diff --git a/org.adempiere.ui.zk/theme/default/login-links.zul b/org.adempiere.ui.zk/theme/default/login-links.zul
index 1668427d5f..ba13863fd3 100644
--- a/org.adempiere.ui.zk/theme/default/login-links.zul
+++ b/org.adempiere.ui.zk/theme/default/login-links.zul
@@ -15,7 +15,7 @@ Copyright (C) 2009 Idalica Corporation
 	}
 </style>
 
-<div class="loginLinksBox" if="${desktop.execution.localName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.localName.startsWith(&quot;demo.&quot;)}"
+<div class="loginLinksBox" if="${desktop.execution.serverName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.serverName.startsWith(&quot;demo.&quot;)}"
 	style="position: absolute; bottom: 5px;">
 
 	<toolbarbutton href="http://www.zkoss.org" image="http://www.zkoss.org/img/zkpowered_s.png"
@@ -29,7 +29,7 @@ Copyright (C) 2009 Idalica Corporation
 		tooltiptext="iDempiere Community" style="height:32px; width:32px" target="_blank"/>
 </div>
 
-<zscript if="${desktop.execution.localName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.localName.startsWith(&quot;demo.&quot;)}">
+<zscript if="${desktop.execution.serverName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.serverName.startsWith(&quot;demo.&quot;)}">
 <![CDATA[
 	getFirefox.setHref("http://www.mozilla.com/?from=sfx&uid=0&t=306");
 ]]>
diff --git a/org.adempiere.ui.zk/theme/default/vendor-logo.zul b/org.adempiere.ui.zk/theme/default/vendor-logo.zul
index dc8901e62d..6a99a4aaa8 100644
--- a/org.adempiere.ui.zk/theme/default/vendor-logo.zul
+++ b/org.adempiere.ui.zk/theme/default/vendor-logo.zul
@@ -6,7 +6,7 @@ Copyright (C) 2009 Idalica Corporation
 <zk>
 
 <div style="background-color: #E5E5E5; margin: 5px;"
-	if="${desktop.execution.localName == &quot;ip-10-8-0-1.ec2.internal&quot;}">
+	if="${desktop.execution.serverName == &quot;ip-10-8-0-1.ec2.internal&quot;}">
 	<hbox align="center">
 		<toolbarbutton
 			href="http://www.idalica.com" image="http://www.testadempiere.com/images/Idalica_Logo-grey-sm.png" target="_blank"/>
@@ -15,7 +15,7 @@ Copyright (C) 2009 Idalica Corporation
 	</hbox>
 </div>
 <div style="background-color: #E5E5E5; margin: 5px;"
-	if="${desktop.execution.localName.startsWith(&quot;demo.&quot;)}">
+	if="${desktop.execution.serverName.startsWith(&quot;demo.&quot;)}">
 	<hbox align="center">
 		<toolbarbutton
 			href="http://www.idempiere.org" image="http://www.idempiere.org/_/rsrc/1341897488671/config/customLogo.gif?revision=2" target="_blank"/>
@@ -23,7 +23,7 @@ Copyright (C) 2009 Idalica Corporation
 			style="font-family:Arial,sans-serif; color:#578BB8; font-size:1.5em; font-weight: bold;" />
 	</hbox>
 </div>
-<div style="height: 90px" if="${desktop.execution.localName != &quot;ip-10-8-0-1.ec2.internal&quot; and ! desktop.execution.localName.startsWith(&quot;demo.&quot;)}">
+<div style="height: 90px" if="${desktop.execution.serverName != &quot;ip-10-8-0-1.ec2.internal&quot; and ! desktop.execution.serverName.startsWith(&quot;demo.&quot;)}">
 	<space/>
 </div>
 
diff --git a/org.adempiere.ui.zk/theme/default/version-info.zul b/org.adempiere.ui.zk/theme/default/version-info.zul
index 1a7d227f7c..1e61bcbebb 100644
--- a/org.adempiere.ui.zk/theme/default/version-info.zul
+++ b/org.adempiere.ui.zk/theme/default/version-info.zul
@@ -55,7 +55,7 @@ Copyright (C) 2009 Idalica Corporation
 		<tr>
 			<td align="right">Host</td>
 			<td>:</td>
-			<td aligh="left">${desktop.execution.localName}</td>
+			<td aligh="left">${desktop.execution.serverName}</td>
 		</tr>
 	</table>
 </div>