diff --git a/ui/scripts/cloud.core.instances.js b/ui/scripts/cloud.core.instances.js
index 24b03e20f83..10438830718 100644
--- a/ui/scripts/cloud.core.instances.js
+++ b/ui/scripts/cloud.core.instances.js
@@ -744,13 +744,9 @@ function showInstancesTab(p_domainId, p_account) {
 							data: "command=updateVirtualMachine&id="+vmId+"&displayName="+encodeURIComponent(name)+"&response=json",
 							dataType: "json",
 							success: function(json) {
-								if (isAdmin()) {
-									var systemName = vmInstance.data("systemName");
-									name = systemName + "(" + name + ")";
-									vmInstance.find("#vm_name").text(name);
-								} else {
-									vmInstance.find("#vm_name").text(name);
-								}
+								var systemName = vmInstance.data("systemName");
+								name = systemName + "(" + name + ")";
+								vmInstance.find("#vm_name").html("<strong>Name:</strong> " + name);
 								vmInstance.data("name", name);
 							},
 							error: function(XMLHttpResponse) {
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 4ebc9df53c2..cb536bc3aa7 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -494,14 +494,10 @@ function getVmName(p_vmName, p_vmDisplayname) {
     if(p_vmDisplayname == null)
         return sanitizeXSS(p_vmName);
     var vmName = null;
-	if (isAdmin()) {
-		if (p_vmDisplayname != p_vmName) {
-			vmName = p_vmName + "(" + sanitizeXSS(p_vmDisplayname) + ")";
-		} else {
-			vmName = p_vmName;
-		}
+	if (p_vmDisplayname != p_vmName) {
+		vmName = p_vmName + "(" + sanitizeXSS(p_vmDisplayname) + ")";
 	} else {
-		vmName = sanitizeXSS(p_vmDisplayname);
+		vmName = p_vmName;
 	}
 	return vmName;
 }