diff --git a/source/HyperSQLOOo/service/pythonpath/hypersql/configuration.py b/source/HyperSQLOOo/service/pythonpath/hypersql/configuration.py
index 8046ff6b..5b104a27 100644
--- a/source/HyperSQLOOo/service/pythonpath/hypersql/configuration.py
+++ b/source/HyperSQLOOo/service/pythonpath/hypersql/configuration.py
@@ -41,6 +41,7 @@
 g_protocol = 'xdbc:hsqldb:'
 g_url = 'sdbc:embedded:hsqldb'
 g_user = 'SA'
-g_options = ';hsqldb.default_table_type=cached;get_column_name=false;ifexists=false'
-g_shutdown = ';shutdown=true'
+g_options = ';hsqldb.default_table_type=cached;shutdown=true'
+g_create = ';create=true'
+g_exist = ';create=false'
 
diff --git a/uno/lib/uno/embedded/documenthandler.py b/uno/lib/uno/embedded/documenthandler.py
index 66f14017..e910be7b 100644
--- a/uno/lib/uno/embedded/documenthandler.py
+++ b/uno/lib/uno/embedded/documenthandler.py
@@ -51,7 +51,8 @@
 from .configuration import g_protocol
 from .configuration import g_catalog
 from .configuration import g_options
-from .configuration import g_shutdown
+from .configuration import g_create
+from .configuration import g_exist
 
 import traceback
 
@@ -184,8 +185,8 @@ def _getDocument(self):
 
     def _getConnectionUrl(self, exist):
         path = self._path[self._index:]
-        url = '%s%s/%s%s' % (g_protocol, path, g_catalog, g_shutdown)
-        return url if exist else url + g_options
+        url = '%s%s/%s%s' % (g_protocol, path, g_catalog, g_options)
+        return url + g_exist if exist else url + g_create
 
     def _getStorageName(self, name, oldname, newname):
         return name.replace(oldname, newname)