diff --git a/README.create-user b/README.create-user
index a0aba82..0364cc0 100644
--- a/README.create-user
+++ b/README.create-user
@@ -55,15 +55,29 @@ mysql_config_editor set --login-path=local --socket=/run/mysqld/mysqld.sock  --u
 # - Backup user
 # ---
 
-INSERT INTO user (Host,User,authentication_string,Select_priv,Reload_priv,Super_priv,Process_priv,Lock_tables_priv,Show_view_priv,Event_priv,Execute_priv,ssl_cipher,x509_issuer,x509_subject) VALUES('localhost','backup',password('backup'),'Y','Y','Y','Y','Y','Y','Y','Y','','','');
+MYSQL_CREDENTIAL_ARGS="--login-path=local"
+USER=backup
+PASS=backup
+
+mysql ${MYSQL_CREDENTIAL_ARGS} -N -s -e \
+   "INSERT INTO user (Host,User,authentication_string,Select_priv,Reload_priv,Super_priv,Process_priv,Lock_tables_priv,Show_view_priv,Event_priv,Execute_priv,ssl_cipher,x509_issuer,x509_subject) VALUES('localhost','${USER}',password('${PASS}'),'Y','Y','Y','Y','Y','Y','Y','Y','','','');"
 
 
 
-CREATE USER IF NOT EXISTS 'admin'@'localhost' IDENTIFIED WITH mysql_native_password ; UPDATE user SET authentication_string = '*B45517A8959A464158F62B12FE7CDBAD79DCA343' WHERE user = 'admin'; FLUSH PRIVILEGES;
-FLUSH PRIVILEGES;
+mysql ${MYSQL_CREDENTIAL_ARGS} -N -s -e \
+   "CREATE USER IF NOT EXISTS 'admin'@'localhost' IDENTIFIED WITH mysql_native_password ; UPDATE user SET authentication_string = '*B45517A8959A464158F62B12FE7CDBAD79DCA343' WHERE user = 'admin'; FLUSH PRIVILEGES;"
 
-CREATE USER 'admin'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*B45517A8959A464158F62B12FE7CDBAD79DCA343' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK;
-FLUSH PRIVILEGES;
+mysql ${MYSQL_CREDENTIAL_ARGS} -N -s -e "FLUSH PRIVILEGES";
+
+
+# ---
+# - Admin user (Warenform)
+# ---
+
+mysql ${MYSQL_CREDENTIAL_ARGS} -N -s -e \
+   "CREATE USER 'admin'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*B45517A8959A464158F62B12FE7CDBAD79DCA343' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK;"
+
+mysql ${MYSQL_CREDENTIAL_ARGS} -N -s -e "FLUSH PRIVILEGES";
 
 
 
@@ -71,13 +85,21 @@ FLUSH PRIVILEGES;
 # MySQL 8.x
 # ---------
 
+MYSQL_CREDENTIAL_ARGS="--login-path=local"
 USER=backup
 PASS=backup
 
-CREATE USER '${USER}'@'localhost' IDENTIFIED WITH mysql_native_password BY '${PASS}'
 
-INSERT INTO user (Host,User,Select_priv,Reload_priv,Super_priv,Process_priv,Lock_tables_priv,Show_view_priv,Event_priv,Execute_priv,ssl_cipher,x509_issuer,x509_subject) VALUES('localhost','backup','Y','Y','Y','Y','Y','Y','Y','Y','','','');-
-
-SET PASSWORD FOR 'backup'@'localhost' = 'backup';
+mysql ${MYSQL_CREDENTIAL_ARGS} -N -s -e \
+   "INSERT INTO user (Host,User,Select_priv,Reload_priv,Super_priv,Process_priv,Lock_tables_priv,Show_view_priv,Event_priv,Execute_priv,ssl_cipher,x509_issuer,x509_subject) VALUES('localhost','${USER}','Y','Y','Y','Y','Y','Y','Y','Y','','','');-"
+
+
+mysql ${MYSQL_CREDENTIAL_ARGS} -N -s -e \
+   "CREATE USER '${USER}'@'localhost' IDENTIFIED WITH mysql_native_password BY '${PASS}'"
+
+mysql ${MYSQL_CREDENTIAL_ARGS} -N -s -e \
+   "SET PASSWORD FOR 'backup'@'localhost' = 'backup';"
+
+mysql ${MYSQL_CREDENTIAL_ARGS} -N -s -e "FLUSH PRIVILEGES";