diff --git a/packages/api/src/controllers/config.js b/packages/api/src/controllers/config.js
index f47c5245a..a7425ab72 100644
--- a/packages/api/src/controllers/config.js
+++ b/packages/api/src/controllers/config.js
@@ -289,16 +289,11 @@ module.exports = {
     const res = await lock.acquire('settings', async () => {
       const currentValue = await this.loadSettings();
       try {
-        let updated = currentValue;
+        let updated = {
+          ...currentValue,
+          ...values,
+        };
         if (process.env.STORAGE_DATABASE) {
-          updated = {
-            ...currentValue,
-            ..._.mapValues(values, v => {
-              if (v === true) return 'true';
-              if (v === false) return 'false';
-              return v;
-            }),
-          };
           await storage.writeConfig({
             group: 'settings',
             config: updated,
diff --git a/packages/api/src/storageModel.js b/packages/api/src/storageModel.js
index dfeb773eb..208358e5d 100644
--- a/packages/api/src/storageModel.js
+++ b/packages/api/src/storageModel.js
@@ -360,6 +360,12 @@ module.exports = {
           "columnName": "value",
           "dataType": "varchar(1000)",
           "notNull": false
+        },
+        {
+          "pureName": "config",
+          "columnName": "valueType",
+          "dataType": "varchar(50)",
+          "notNull": false
         }
       ],
       "foreignKeys": [],
diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts
index 938d56bff..fdf6556b1 100644
--- a/packages/web/src/commands/stdCommands.ts
+++ b/packages/web/src/commands/stdCommands.ts
@@ -40,8 +40,6 @@ import { getSettings } from '../utility/metadataLoaders';
 import { isMac, switchCurrentDatabase } from '../utility/common';
 import { doLogout } from '../clientAuth';
 import { disconnectServerConnection } from '../appobj/ConnectionAppObject.svelte';
-import UploadErrorModal from '../modals/UploadErrorModal.svelte';
-import ErrorMessageModal from '../modals/ErrorMessageModal.svelte';
 import NewCollectionModal from '../modals/NewCollectionModal.svelte';
 import ConfirmModal from '../modals/ConfirmModal.svelte';
 import localforage from 'localforage';
@@ -73,7 +71,8 @@ registerCommand({
   category: __t('command.theme', { defaultMessage: 'Theme' }),
   name: __t('command.theme.change', { defaultMessage: 'Change' }),
   toolbarName: __t('command.theme.changeToolbar', { defaultMessage: 'Change theme' }),
-  onClick: () => openNewTab({
+  onClick: () =>
+    openNewTab({
       title: 'Settings',
       icon: 'icon settings',
       tabComponent: 'SettingsTab',
@@ -1230,8 +1229,7 @@ registerCommand({
   },
 });
 
-if ( hasPermission('application-log'))
-{
+if (hasPermission('application-log')) {
   registerCommand({
     id: 'app.showLogs',
     category: __t('command.application', { defaultMessage: 'Application' }),
@@ -1246,8 +1244,7 @@ if ( hasPermission('application-log'))
   });
 }
 
-if (hasPermission('widgets/plugins'))
-{
+if (hasPermission('widgets/plugins')) {
   registerCommand({
     id: 'app.managePlugins',
     category: __t('command.application', { defaultMessage: 'Application' }),
diff --git a/packages/web/src/settings/ConnectionSettings.svelte b/packages/web/src/settings/ConnectionSettings.svelte
index 31903e5a4..0576be217 100644
--- a/packages/web/src/settings/ConnectionSettings.svelte
+++ b/packages/web/src/settings/ConnectionSettings.svelte
@@ -1,81 +1,64 @@
 <script lang="ts">
-  import CheckboxField from "../forms/CheckboxField.svelte";
-  import FormCheckboxField from "../forms/FormCheckboxField.svelte";
-  import FormFieldTemplateLarge from "../forms/FormFieldTemplateLarge.svelte";
-  import FormSelectField from "../forms/FormSelectField.svelte";
-  import FormTextField from "../forms/FormTextField.svelte";
-  import FormValues from "../forms/FormValues.svelte";
-  import { lockedDatabaseMode } from "../stores";
-  import { _t } from "../translations";
-
-    
+  import CheckboxField from '../forms/CheckboxField.svelte';
+  import FormCheckboxField from '../forms/FormCheckboxField.svelte';
+  import FormFieldTemplateLarge from '../forms/FormFieldTemplateLarge.svelte';
+  import FormSelectField from '../forms/FormSelectField.svelte';
+  import FormTextField from '../forms/FormTextField.svelte';
+  import FormValues from '../forms/FormValues.svelte';
+  import { lockedDatabaseMode } from '../stores';
+  import { _t } from '../translations';
 </script>
 
 <div class="wrapper">
-<FormValues let:values>
+  <FormValues let:values>
     <div class="heading">{_t('settings.connection', { defaultMessage: 'Connection' })}</div>
 
-    <FormFieldTemplateLarge
-    label={_t('settings.connection.showOnlyTabsFromSelectedDatabase', {
-        defaultMessage: 'Show only tabs from selected database',
-    })}
-    type="checkbox"
-    labelProps={{
-        onClick: () => {
-        $lockedDatabaseMode = !$lockedDatabaseMode;
-        },
-    }}
-    >
-    <CheckboxField checked={$lockedDatabaseMode} on:change={e => ($lockedDatabaseMode = e.target.checked)} data-testid="ConnectionSettings_lockedDatabaseMode"/>
-    </FormFieldTemplateLarge>
-
     <FormCheckboxField
-    name="connection.autoRefresh"
-    label={_t('settings.connection.autoRefresh', {
+      name="connection.autoRefresh"
+      label={_t('settings.connection.autoRefresh', {
         defaultMessage: 'Automatic refresh of database model on background',
-    })}
-    defaultValue={false}
+      })}
+      defaultValue={false}
     />
     <FormTextField
-    name="connection.autoRefreshInterval"
-    label={_t('settings.connection.autoRefreshInterval', {
+      name="connection.autoRefreshInterval"
+      label={_t('settings.connection.autoRefreshInterval', {
         defaultMessage: 'Interval between automatic DB structure reloads in seconds',
-    })}
-    defaultValue="30"
-    disabled={values['connection.autoRefresh'] === false}
+      })}
+      defaultValue="30"
+      disabled={values['connection.autoRefresh'] === false}
     />
     <FormSelectField
-    label={_t('settings.connection.sshBindHost', { defaultMessage: 'Local host address for SSH connections' })}
-    name="connection.sshBindHost"
-    isNative
-    defaultValue="127.0.0.1"
-    options={[
+      label={_t('settings.connection.sshBindHost', { defaultMessage: 'Local host address for SSH connections' })}
+      name="connection.sshBindHost"
+      isNative
+      defaultValue="127.0.0.1"
+      options={[
         { value: '127.0.0.1', label: '127.0.0.1 (IPv4)' },
         { value: '::1', label: '::1  (IPv6)' },
         { value: 'localhost', label: 'localhost (domain name)' },
-    ]}
+      ]}
     />
 
     <div class="heading">{_t('settings.session', { defaultMessage: 'Query sessions' })}</div>
     <FormCheckboxField
-    name="session.autoClose"
-    label={_t('settings.session.autoClose', {
+      name="session.autoClose"
+      label={_t('settings.session.autoClose', {
         defaultMessage: 'Automatic close query sessions after period without any activity',
-    })}
-    defaultValue={true}
+      })}
+      defaultValue={true}
     />
     <FormTextField
-    name="session.autoCloseTimeout"
-    label={_t('settings.session.autoCloseTimeout', {
+      name="session.autoCloseTimeout"
+      label={_t('settings.session.autoCloseTimeout', {
         defaultMessage: 'Interval, after which query session without activity is closed (in minutes)',
-    })}
-    defaultValue="15"
-    disabled={values['session.autoClose'] === false}
+      })}
+      defaultValue="15"
+      disabled={values['session.autoClose'] === false}
     />
-</FormValues>
+  </FormValues>
 </div>
 
-
 <style>
   .heading {
     font-size: 20px;
@@ -84,12 +67,11 @@
     margin-top: var(--dim-large-form-margin);
   }
 
-  .wrapper :global(input){
+  .wrapper :global(input) {
     max-width: 400px;
   }
 
-  .wrapper :global(select){
+  .wrapper :global(select) {
     max-width: 400px;
   }
-
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/web/src/settings/GeneralSettings.svelte b/packages/web/src/settings/GeneralSettings.svelte
index 364c6d939..c5fd0fe2d 100644
--- a/packages/web/src/settings/GeneralSettings.svelte
+++ b/packages/web/src/settings/GeneralSettings.svelte
@@ -10,6 +10,9 @@
   import { isMac } from '../utility/common';
   import getElectron from '../utility/getElectron';
   import ConfirmModal from '../modals/ConfirmModal.svelte';
+  import hasPermission from '../utility/hasPermission';
+  import CheckboxField from '../forms/CheckboxField.svelte';
+  import { lockedDatabaseMode } from '../stores';
 
   const electron = getElectron();
   let restartWarning = false;
@@ -78,6 +81,24 @@
     />
   {/if}
 
+  <FormFieldTemplateLarge
+    label={_t('settings.connection.showOnlyTabsFromSelectedDatabase', {
+      defaultMessage: 'Show only tabs from selected database',
+    })}
+    type="checkbox"
+    labelProps={{
+      onClick: () => {
+        $lockedDatabaseMode = !$lockedDatabaseMode;
+      },
+    }}
+  >
+    <CheckboxField
+      checked={$lockedDatabaseMode}
+      on:change={e => ($lockedDatabaseMode = e.target['checked'])}
+      data-testid="ConnectionSettings_lockedDatabaseMode"
+    />
+  </FormFieldTemplateLarge>
+
   <div class="heading">{_t('settings.appearance', { defaultMessage: 'Appearance' })}</div>
 
   {#if electron}
@@ -106,6 +127,7 @@
       defaultMessage: 'Show server name alongside database name in title of the tab group',
     })}
     defaultValue={false}
+    disabled={!hasPermission('settings/change')}
   />
 </div>
 
diff --git a/packages/web/src/settings/settingsTools.ts b/packages/web/src/settings/settingsTools.ts
index 41028529d..8e2e2ec79 100644
--- a/packages/web/src/settings/settingsTools.ts
+++ b/packages/web/src/settings/settingsTools.ts
@@ -29,6 +29,13 @@ export function getStringSettingsValue(name, defaultValue) {
   return res;
 }
 
+export function getObjectSettingsValue(name, defaultValue) {
+  const settings = getCurrentSettings();
+  const res = settings[name];
+  if (res == null) return defaultValue;
+  return res;
+}
+
 export function getConnectionClickActionSetting(): 'connect' | 'openDetails' | 'none' {
   return getStringSettingsValue('defaultAction.connectionClick', 'connect');
 }
diff --git a/packages/web/src/tabs/SettingsTab.svelte b/packages/web/src/tabs/SettingsTab.svelte
index 290530b96..431a15ceb 100644
--- a/packages/web/src/tabs/SettingsTab.svelte
+++ b/packages/web/src/tabs/SettingsTab.svelte
@@ -3,111 +3,114 @@
 </script>
 
 <script lang="ts">
-  import SettingsMenuControl from "../elements/SettingsMenuControl.svelte";
-  import GeneralSettings from "../settings/GeneralSettings.svelte";
-  import SettingsFormProvider from "../forms/SettingsFormProvider.svelte";
-  import ConnectionSettings from "../settings/ConnectionSettings.svelte";
-  import ThemeSettings from "../settings/ThemeSettings.svelte";
-  import DefaultActionsSettings from "../settings/DefaultActionsSettings.svelte";
-  import BehaviourSettings from "../settings/BehaviourSettings.svelte";
-  import ExternalToolsSettings from "../settings/ExternalToolsSettings.svelte";
-  import LicenseSettings from "../settings/LicenseSettings.svelte";
-  import { isProApp } from "../utility/proTools";
-  import { _t } from "../translations";
-  import CommandListTab from "./CommandListTab.svelte";
-  import DataGridSettings from "../settings/DataGridSettings.svelte";
-    import SQLEditorSettings from "../settings/SQLEditorSettings.svelte";
-    import AiSettingsTab from "../settings/AiSettingsTab.svelte";
+  import SettingsMenuControl from '../elements/SettingsMenuControl.svelte';
+  import GeneralSettings from '../settings/GeneralSettings.svelte';
+  import SettingsFormProvider from '../forms/SettingsFormProvider.svelte';
+  import ConnectionSettings from '../settings/ConnectionSettings.svelte';
+  import ThemeSettings from '../settings/ThemeSettings.svelte';
+  import DefaultActionsSettings from '../settings/DefaultActionsSettings.svelte';
+  import BehaviourSettings from '../settings/BehaviourSettings.svelte';
+  import ExternalToolsSettings from '../settings/ExternalToolsSettings.svelte';
+  import LicenseSettings from '../settings/LicenseSettings.svelte';
+  import { isProApp } from '../utility/proTools';
+  import { _t } from '../translations';
+  import CommandListTab from './CommandListTab.svelte';
+  import DataGridSettings from '../settings/DataGridSettings.svelte';
+  import SQLEditorSettings from '../settings/SQLEditorSettings.svelte';
+  import AiSettingsTab from '../settings/AiSettingsTab.svelte';
+  import hasPermission from '../utility/hasPermission';
 
-    export let selectedItem = 'general';
+  export let selectedItem = 'general';
 
-    const menuItems = [
-        {
-            label: _t('settings.general', { defaultMessage: 'General' }),
-            identifier: 'general',
-            component: GeneralSettings,
-            props: {},
-            testid: 'settings-general',
-        },
-        {
-            label: _t('settings.connection', { defaultMessage: 'Connection' }),
-            identifier: 'connection',
-            component: ConnectionSettings,
-            props: {},
-            testid: 'settings-connection',
-        },
-        {
-            label: _t('settings.dataGrid.title', { defaultMessage: 'Data grid' }),
-            identifier: 'data-grid',
-            component: DataGridSettings,
-            props: {},
-            testid: 'settings-data-grid',
-        },
-        {
-            label: _t('settings.sqlEditor.title', { defaultMessage: 'SQL Editor' }),
-            identifier: 'sql-editor',
-            component: SQLEditorSettings,
-            props: {},
-            testid: 'settings-sql-editor',
-        },
-        {
-            label: _t('settings.theme', { defaultMessage: 'Themes' }),
-            identifier: 'theme',
-            component: ThemeSettings,
-            props: {},
-            testid: 'settings-themes',
-        },
-        {
-            label: _t('settings.defaultActions', { defaultMessage: 'Default Actions' }),
-            identifier: 'default-actions',
-            component: DefaultActionsSettings,
-            props: {},
-            testid: 'settings-default-actions',
-        },
-        {
-            label: _t('settings.behaviour', { defaultMessage: 'Behaviour' }),
-            identifier: 'behaviour',
-            component: BehaviourSettings,
-            props: {},
-            testid: 'settings-behaviour',
-        },
-        {
-            label: _t('settings.externalTools', { defaultMessage: 'External Tools' }),
-            identifier: 'external-tools',
-            component: ExternalToolsSettings,
-            props: {},
-            testid: 'settings-external-tools',
-        },
-        {
-            label: _t('command.settings.shortcuts', { defaultMessage: 'Keyboard shortcuts' }),
-            identifier: 'shortcuts',
-            component: CommandListTab,
-            props: {},
-            testid: 'settings-shortcuts',
-        },
-        isProApp() && {
-            label: _t('settings.license', { defaultMessage: 'License' }),
-            identifier: 'license',
-            component: LicenseSettings,
-            props: {},
-            testid: 'settings-license',
-        },
-        isProApp() && {
-            label: _t('settings.AI', { defaultMessage: 'AI'}),
-            identifier: 'ai',
-            component: AiSettingsTab,
-            props: {},
-            testid: 'settings-ai',
-        },
-    ];
+  const menuItems = [
+    {
+      label: _t('settings.general', { defaultMessage: 'General' }),
+      identifier: 'general',
+      component: GeneralSettings,
+      props: {},
+      testid: 'settings-general',
+    },
+    hasPermission('settings/change') && {
+      label: _t('settings.connection', { defaultMessage: 'Connection' }),
+      identifier: 'connection',
+      component: ConnectionSettings,
+      props: {},
+      testid: 'settings-connection',
+    },
+    hasPermission('settings/change') && {
+      label: _t('settings.dataGrid.title', { defaultMessage: 'Data grid' }),
+      identifier: 'data-grid',
+      component: DataGridSettings,
+      props: {},
+      testid: 'settings-data-grid',
+    },
+    hasPermission('settings/change') && {
+      label: _t('settings.sqlEditor.title', { defaultMessage: 'SQL Editor' }),
+      identifier: 'sql-editor',
+      component: SQLEditorSettings,
+      props: {},
+      testid: 'settings-sql-editor',
+    },
+    {
+      label: _t('settings.theme', { defaultMessage: 'Themes' }),
+      identifier: 'theme',
+      component: ThemeSettings,
+      props: {},
+      testid: 'settings-themes',
+    },
+    hasPermission('settings/change') && {
+      label: _t('settings.defaultActions', { defaultMessage: 'Default Actions' }),
+      identifier: 'default-actions',
+      component: DefaultActionsSettings,
+      props: {},
+      testid: 'settings-default-actions',
+    },
+    hasPermission('settings/change') && {
+      label: _t('settings.behaviour', { defaultMessage: 'Behaviour' }),
+      identifier: 'behaviour',
+      component: BehaviourSettings,
+      props: {},
+      testid: 'settings-behaviour',
+    },
+    hasPermission('settings/change') && {
+      label: _t('settings.externalTools', { defaultMessage: 'External Tools' }),
+      identifier: 'external-tools',
+      component: ExternalToolsSettings,
+      props: {},
+      testid: 'settings-external-tools',
+    },
+    hasPermission('settings/change') && {
+      label: _t('command.settings.shortcuts', { defaultMessage: 'Keyboard shortcuts' }),
+      identifier: 'shortcuts',
+      component: CommandListTab,
+      props: {},
+      testid: 'settings-shortcuts',
+    },
+    hasPermission('settings/change') &&
+      isProApp() && {
+        label: _t('settings.license', { defaultMessage: 'License' }),
+        identifier: 'license',
+        component: LicenseSettings,
+        props: {},
+        testid: 'settings-license',
+      },
+    hasPermission('settings/change') &&
+      isProApp() && {
+        label: _t('settings.AI', { defaultMessage: 'AI' }),
+        identifier: 'ai',
+        component: AiSettingsTab,
+        props: {},
+        testid: 'settings-ai',
+      },
+  ];
 </script>
 
 <SettingsFormProvider>
-  <SettingsMenuControl 
-      items={menuItems}
-      bind:value={selectedItem}
-      flex1={true}
-      flexColContainer={true}
-      scrollableContentContainer={true}
+  <SettingsMenuControl
+    items={menuItems}
+    bind:value={selectedItem}
+    flex1={true}
+    flexColContainer={true}
+    scrollableContentContainer={true}
   />
-</SettingsFormProvider>
\ No newline at end of file
+</SettingsFormProvider>