diff --git a/make_ami.sh b/make_ami.sh
index 743827c..ec89fb7 100755
--- a/make_ami.sh
+++ b/make_ami.sh
@@ -156,6 +156,10 @@ install_core_packages() {
     # anyhow. With this configuration boot messages will still display in the
     # EC2 console.
     sed -Ei '/^tty\d/s/^/#/' /etc/inittab
+
+    # Make it a little more obvious who is logged in by adding username to the
+    # prompt
+    sed -i "s/^export PS1='/&\\\\u@/" /etc/profile
 }
 
 create_initfs() {