diff --git a/additional-material/db/xcs-sample-mysql.sql b/additional-material/db/xcs-sample-mysql.sql
index 5a3e4688575cfecd4e0cb4c3fc1fd75b25103efc..077de42b6edf4d59901454c099f90b68769a2f23 100644
--- a/additional-material/db/xcs-sample-mysql.sql
+++ b/additional-material/db/xcs-sample-mysql.sql
@@ -31,7 +31,8 @@ CREATE TABLE `Pet` (
 --
 -- User creation
 --
-GRANT ALL PRIVILEGES ON xcs.* TO xcs@localhost IDENTIFIED BY 'xcs'; 
+CREATE USER IF NOT EXISTS xcs@localhost IDENTIFIED BY 'xcs';
+GRANT ALL PRIVILEGES ON xcs.* TO xcs@localhost; 
 FLUSH PRIVILEGES;
 
 --
diff --git a/additional-material/db/xcs-sample-test-mysql.sql b/additional-material/db/xcs-sample-test-mysql.sql
index ad6b19a32138dad2d229204c8dd1b5040261b341..7d1fb0b64fbe340449d10cdc23ad586fb8ef3807 100644
--- a/additional-material/db/xcs-sample-test-mysql.sql
+++ b/additional-material/db/xcs-sample-test-mysql.sql
@@ -31,5 +31,6 @@ CREATE TABLE `Pet` (
 --
 -- User creation
 --
-GRANT ALL PRIVILEGES ON xcssampletest.* TO xcs@localhost IDENTIFIED BY 'xcs'; 
+CREATE USER IF NOT EXISTS xcs@localhost IDENTIFIED BY 'xcs';
+GRANT ALL PRIVILEGES ON xcssampletest.* TO xcs@localhost; 
 FLUSH PRIVILEGES;
\ No newline at end of file