diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index 672c841de6..e3c73fca51 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -125,19 +125,17 @@ then
 
     # Generate Zebra database password.
     zebrapwd="$(pwgen -1)"
-
     # Set up MySQL database for this instance.
     if [ "$op" = create ]
     then
         mysql --defaults-extra-file=/etc/mysql/koha-common.cnf <<eof
-CREATE DATABASE $mysqldb;
-CREATE USER '$mysqluser'@'%' IDENTIFIED BY '$mysqlpwd';
-GRANT ALL PRIVILEGES ON $mysqldb.* TO '$mysqluser';
+CREATE DATABASE \`$mysqldb\`;
+CREATE USER \`$mysqluser\`@'%' IDENTIFIED BY '$mysqlpwd';
+GRANT ALL PRIVILEGES ON \`$mysqldb\`.* TO \`$mysqluser\`;
 FLUSH PRIVILEGES;
 eof
     fi
 
-
     # Generate and install Apache site-available file and log dir.
     generate_config_file apache-site.conf.in \
         "/etc/apache2/sites-available/$name"
diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove
index 97399cca35..10a8b781e5 100755
--- a/debian/scripts/koha-remove
+++ b/debian/scripts/koha-remove
@@ -25,8 +25,8 @@ do
     echo "Removing Koha instance $name"
 
     mysql --defaults-extra-file=/etc/mysql/koha-common.cnf <<eof
-DROP USER 'koha_$name';
-DROP DATABASE koha_$name;
+DROP USER \`koha_$name\`;
+DROP DATABASE \`koha_$name\`;
 FLUSH PRIVILEGES;
 eof