diff --git a/core/src/com/cloud/vm/ConsoleProxyVO.java b/core/src/com/cloud/vm/ConsoleProxyVO.java
index 5df6ee0b38c..3a080d5ce65 100644
--- a/core/src/com/cloud/vm/ConsoleProxyVO.java
+++ b/core/src/com/cloud/vm/ConsoleProxyVO.java
@@ -72,7 +72,7 @@ public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
      */
     public ConsoleProxyVO(long id, long serviceOfferingId, String name, long templateId, HypervisorType hypervisorType, long guestOSId, long dataCenterId, long domainId, long accountId,
             int activeSession, boolean haEnabled) {
-        super(id, serviceOfferingId, name, name, Type.ConsoleProxy, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
+        super(id, serviceOfferingId, null, name, Type.ConsoleProxy, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
         this.activeSession = activeSession;
     }
 
diff --git a/core/src/com/cloud/vm/DomainRouterVO.java b/core/src/com/cloud/vm/DomainRouterVO.java
index b341a37f28a..bc29df8df3c 100755
--- a/core/src/com/cloud/vm/DomainRouterVO.java
+++ b/core/src/com/cloud/vm/DomainRouterVO.java
@@ -95,7 +95,7 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
             boolean isPriorityBumpUp,
             RedundantState redundantState,
             boolean haEnabled, boolean stopPending) {
-        super(id, serviceOfferingId, name, name, Type.DomainRouter, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
+        super(id, serviceOfferingId, null, name, Type.DomainRouter, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
         this.elementId = elementId;
         this.networkId = networkId;
         this.isRedundantRouter = isRedundantRouter;
diff --git a/core/src/com/cloud/vm/SecondaryStorageVmVO.java b/core/src/com/cloud/vm/SecondaryStorageVmVO.java
index 4724bb37d16..10c161b911f 100644
--- a/core/src/com/cloud/vm/SecondaryStorageVmVO.java
+++ b/core/src/com/cloud/vm/SecondaryStorageVmVO.java
@@ -66,7 +66,7 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora
 
     public SecondaryStorageVmVO(long id, long serviceOfferingId, String name, long templateId, HypervisorType hypervisorType, long guestOSId, long dataCenterId, long domainId, long accountId,
             Role role, boolean haEnabled) {
-        super(id, serviceOfferingId, name, name, Type.SecondaryStorageVm, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
+        super(id, serviceOfferingId, null, name, Type.SecondaryStorageVm, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
         this.role = role;
     }
 
diff --git a/core/src/com/cloud/vm/UserVmVO.java b/core/src/com/cloud/vm/UserVmVO.java
index 3cd1bbf4cae..8f8b815936a 100755
--- a/core/src/com/cloud/vm/UserVmVO.java
+++ b/core/src/com/cloud/vm/UserVmVO.java
@@ -85,7 +85,7 @@ public class UserVmVO extends VMInstanceVO implements UserVm {
                     String name) {
         super(id, serviceOfferingId, name, instanceName, Type.User, templateId, hypervisorType, guestOsId, domainId, accountId, haEnabled, limitCpuUse);
         this.userData = userData;
-        this.displayName = displayName != null ? displayName : name != null ? name : instanceName;
+        this.displayName = displayName != null ? displayName : getUuid();
     	this.details = new HashMap<String, String>();
     }
     
diff --git a/core/src/com/cloud/vm/VMInstanceVO.java b/core/src/com/cloud/vm/VMInstanceVO.java
index 8691a9c6349..90c3afdeeb6 100644
--- a/core/src/com/cloud/vm/VMInstanceVO.java
+++ b/core/src/com/cloud/vm/VMInstanceVO.java
@@ -147,7 +147,8 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
     Map<String, String> details;
 
     @Column(name="uuid")
-    protected String uuid;
+    protected String uuid = UUID.randomUUID().toString();
+;
     
     public VMInstanceVO(long id,
                         long serviceOfferingId,
@@ -161,7 +162,7 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
                         long accountId,
                         boolean haEnabled) {
         this.id = id;
-        this.hostName = name != null ? name : instanceName;
+        this.hostName = name != null ? name : this.uuid;
         if (vmTemplateId != null) {
             this.templateId = vmTemplateId;
         }
@@ -176,7 +177,6 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
         this.serviceOfferingId = serviceOfferingId;
         this.hypervisorType = hypervisorType;
         this.limitCpuUse = false;
-        this.uuid = UUID.randomUUID().toString();
     }
 
     public VMInstanceVO(long id,
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index ea5a3c6ee37..17027424440 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2427,8 +2427,10 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
         long id = _vmDao.getNextInSequence(Long.class, "id");
 
         String instanceName = VirtualMachineName.getVmName(id, owner.getId(), _instance);
+        
+        String uuidName = UUID.randomUUID().toString();
         if (hostName == null) {
-            hostName = instanceName;
+            hostName = uuidName;
         } else {
             // verify hostName (hostname doesn't have to be unique)
             if (!NetUtils.verifyDomainNameLabel(hostName, true)) {
@@ -2436,6 +2438,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
                         + "and the hyphen ('-'), must be between 1 and 63 characters long, and can't start or end with \"-\" and can't start with digit");
             }
         }
+        if(displayName == null)
+            displayName = uuidName;
 
         HypervisorType hypervisorType = null;
         if (template == null || template.getHypervisorType() == null || template.getHypervisorType() == HypervisorType.None) {
@@ -2447,7 +2451,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
         txn.start();
         UserVmVO vm = new UserVmVO(id, instanceName, displayName, template.getId(), hypervisorType, template.getGuestOSId(), offering.getOfferHA(), offering.getLimitCpuUse(), owner.getDomainId(), owner.getId(),
                 offering.getId(), userData, hostName);
-
+        vm.setUuid(uuidName);
+        
         if (sshPublicKey != null) {
             vm.setDetail("SSH.PublicKey", sshPublicKey);
         }