diff --git a/include/dbemail.tmpl b/include/dbemail.tmpl
index ee22c3e..b472b96 100644
--- a/include/dbemail.tmpl
+++ b/include/dbemail.tmpl
@@ -3,5 +3,5 @@ Hello _username_;
 Your database has been provisioned.  Information below should be used to connect to it:
 
 Database name: _username_
-Database user: _username_
+Database user: _databasename_
 Password: _password_
diff --git a/makedb b/makedb
index beb8249..74fe915 100755
--- a/makedb
+++ b/makedb
@@ -20,6 +20,6 @@ then
   echo -e "usage: $(basename $0) <user name> [database name]"
 else
   database_create
-  sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" include/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $USER@thunix.net
-  sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" include/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $ADMIN_EMAIL
+  sed -e "s/_username_/$USER/g" -e "s/_databasename_/$DATABASE/g" -e "s/_password_/$PASSWORD/g" include/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $USER@thunix.net
+  sed -e "s/_username_/$USER/g" -e "s/_databasename_/$DATABASE/g" -e "s/_password_/$PASSWORD/g" include/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $ADMIN_EMAIL
 fi