diff --git a/heat/cloudinit/config b/heat/cloudinit/config
index a5f2771e08..2efbd19aba 100644
--- a/heat/cloudinit/config
+++ b/heat/cloudinit/config
@@ -1,4 +1,5 @@
-#cloud-config
+user: ec2-user
+
 cloud_config_modules:
  - locale
  - set_hostname
diff --git a/heat/jeos/U10-amd64-cfntools-jeos.tdl b/heat/jeos/U10-amd64-cfntools-jeos.tdl
index 0440e36508..5ea4db184b 100644
--- a/heat/jeos/U10-amd64-cfntools-jeos.tdl
+++ b/heat/jeos/U10-amd64-cfntools-jeos.tdl
@@ -11,7 +11,7 @@
   <description>Ubuntu 10.04</description>
   <commands>
     <command name='commands'>
-apt-get -y upgrade;apt-get -y install cloud-init;/usr/sbin/useradd ec2-user;echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers;chmod +x /opt/aws/bin/cfn-*
+apt-get -y upgrade;apt-get -y install cloud-init;/usr/sbin/useradd -m ec2-user;echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers;chmod +x /opt/aws/bin/cfn-*
     </command>
   </commands>
   <files>