diff --git a/trytond/web_service/db.py b/trytond/web_service/db.py
index 12e7b1d831..93f382b80c 100644
--- a/trytond/web_service/db.py
+++ b/trytond/web_service/db.py
@@ -37,8 +37,8 @@ class DB(Service):
         cursor.conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
         try:
             try:
-                cursor.execute('CREATE DATABASE ' + db_name + \
-                        ' ENCODING \'unicode\'')
+                cursor.execute('CREATE DATABASE "' + db_name + '" '\
+                        'ENCODING \'unicode\'')
                 cursor.commit()
                 cursor.close()
 
@@ -90,7 +90,7 @@ class DB(Service):
         cursor.conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
         try:
             try:
-                cursor.execute('DROP DATABASE ' + db_name)
+                cursor.execute('DROP DATABASE "' + db_name + '"')
                 cursor.commit()
             except:
                 logger.notify_channel("web-service", LOG_ERROR,
@@ -155,7 +155,7 @@ class DB(Service):
         database = sql_db.db_connect('template1')
         cursor = database.cursor()
         cursor.conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
-        cursor.execute('CREATE DATABASE ' + db_name + ' ENCODING \'unicode\'')
+        cursor.execute('CREATE DATABASE "' + db_name + '" ENCODING \'unicode\'')
         cursor.commit()
         cursor.close()