diff --git a/src/main/resources/db/mysql/user.sql b/src/main/resources/db/mysql/user.sql
index d2c7b88a0..4cdf825e3 100644
--- a/src/main/resources/db/mysql/user.sql
+++ b/src/main/resources/db/mysql/user.sql
@@ -4,4 +4,8 @@ ALTER DATABASE petclinic
   DEFAULT CHARACTER SET utf8
   DEFAULT COLLATE utf8_general_ci;
 
-GRANT ALL PRIVILEGES ON petclinic.* TO 'petclinic'@'%' IDENTIFIED BY 'petclinic';
+CREATE USER IF NOT EXISTS 'petclinic'@'%' IDENTIFIED BY 'petclinic';
+
+GRANT ALL PRIVILEGES ON petclinic.* TO 'petclinic'@'%';
+
+FLUSH PRIVILEGES;