diff --git a/etc/heat/heat-engine.conf b/etc/heat/heat-engine.conf
index 25bbaa728..c88cef769 100644
--- a/etc/heat/heat-engine.conf
+++ b/etc/heat/heat-engine.conf
@@ -31,6 +31,11 @@ instance_connection_is_secure = 0
 # be enabled or disabled
 instance_connection_https_validate_certificates = 1
 
+# The default user that heat creates in users for ssh
+# administration is `ec2-user`, which is compatible with
+# AWS CloudFormation. You can change it with instance_user
+# instance_user = heat-admin
+
 # URL for instances to connect for metadata
 # ie the IP of the bridge device connecting the
 # instances with the host and the bind_port of