diff --git a/bin/heat-db-setup-fedora b/bin/heat-db-setup-fedora
index 8d2eff95d5..6153f5353b 100755
--- a/bin/heat-db-setup-fedora
+++ b/bin/heat-db-setup-fedora
@@ -199,11 +199,9 @@ echo "Verified connectivity to MySQL."
 
 echo "Creating 'heat' database."
 cat << EOF | mysql -u root ${MYSQL_ROOT_PW_ARG}
-CREATE DATABASE heat;
-CREATE USER 'heat'@'localhost' IDENTIFIED BY '${MYSQL_HEAT_PW}';
-CREATE USER 'heat'@'%' IDENTIFIED BY '${MYSQL_HEAT_PW}';
-GRANT ALL ON heat.* TO 'heat'@'localhost';
-GRANT ALL ON heat.* TO 'heat'@'%';
+CREATE DATABASE IF NOT EXISTS heat;
+GRANT ALL ON heat.* TO 'heat'@'localhost' IDENTIFIED BY '${MYSQL_HEAT_PW}';
+GRANT ALL ON heat.* TO 'heat'@'%' IDENTIFIED BY '${MYSQL_HEAT_PW}';
 flush privileges;
 EOF