diff --git a/code/zato-cli/src/zato/cli/create_web_admin.py b/code/zato-cli/src/zato/cli/create_web_admin.py
index 1350f3380c..269d52914b 100644
--- a/code/zato-cli/src/zato/cli/create_web_admin.py
+++ b/code/zato-cli/src/zato/cli/create_web_admin.py
@@ -34,6 +34,7 @@
   "DATABASE_PASSWORD": "{DATABASE_PASSWORD}",
   "DATABASE_HOST": "{DATABASE_HOST}",
   "DATABASE_PORT": "{DATABASE_PORT}",
+  "DATABASE_OPTIONS": {"timeout": 30},
 
   "TIME_ZONE": "America/New_York",
   "LANGUAGE_CODE": "en-us",
diff --git a/code/zato-web-admin/src/zato/admin/settings.py b/code/zato-web-admin/src/zato/admin/settings.py
index 6a3fd5959a..890d375858 100644
--- a/code/zato-web-admin/src/zato/admin/settings.py
+++ b/code/zato-web-admin/src/zato/admin/settings.py
@@ -152,7 +152,7 @@
     db_data = DATABASES['default']
     db_data['ENGINE'] = 'django.db.backends.' + django_sqlalchemy_engine[db_type]
 
-    for name in('ENGINE', 'NAME', 'USER', 'PASSWORD', 'HOST', 'PORT'):
+    for name in('ENGINE', 'NAME', 'USER', 'PASSWORD', 'HOST', 'PORT', 'OPTIONS'):
         globals()['DATABASE_{}'.format(name)] = DATABASES['default'][name]
 
     db_data['db_type'] = db_type
diff --git a/code/zato-web-admin/src/zato/admin/zato_settings.py b/code/zato-web-admin/src/zato/admin/zato_settings.py
index dca70d82ae..56a84f7fa4 100644
--- a/code/zato-web-admin/src/zato/admin/zato_settings.py
+++ b/code/zato-web-admin/src/zato/admin/zato_settings.py
@@ -51,7 +51,8 @@ def update_globals(config, base_dir='.', needs_crypto=True):
             k = k.replace('DATABASE_', '', 1)
             if k == 'PASSWORD' and config['db_type'] != 'sqlite':
                 v = cm.decrypt(v)
-            default[k] = str(v)
+            v = str(v) if k != 'OPTIONS' else v
+            default[k] = v
         else:
             if k == 'ADMIN_INVOKE_PASSWORD' and needs_crypto:
                 v = cm.decrypt(v)