diff --git a/docs/settings/global.md b/docs/settings/global.md
index a8c08da..fc4b17b 100644
--- a/docs/settings/global.md
+++ b/docs/settings/global.md
@@ -17,7 +17,15 @@ Global settings are arranged in the following categories:
 
 ### Server Settings
 
-Configuration of basic server settings
+Configuration of basic server settings.
+
+| Setting | Type | Description | Default |
+| --- | --- | --- | --- |
+| InvenTree Instance Name | String | String descriptor for the InvenTree server instance | InvenTree Server |
+| Use Instance Name | Boolean | Use instance name in title bars | False |
+| Base URL | String | Base URL for server instance | *blank* |
+| Company Name | String | Company name | My compant name |
+| Download from URL | Boolean | Allow downloading of images from remote URLs | False |
 
 ### Login Settings
 
@@ -38,14 +46,29 @@ Change how logins, password-forgot, signups are handled.
 
 Configuration of barcode functionality
 
+| Setting | Type | Description | Default |
+| --- | --- | --- | --- |
+| Barcode Support | Boolean | Enable barcode functionality in web interface | True |
+
 ### Currencies
 
 Configuration of currency support
 
+| Setting | Type | Description | Default |
+| --- | --- | --- | --- |
+| Default Currency | Currency | Default currency | USD | 
+
 ### Reporting
 
 Configuration of report generation
 
+| Setting | Type | Description | Default |
+| --- | --- | --- | --- |
+| Enable Reports | Boolean | Enable report generation | False |
+| Page Size | String | Default page size | A4 |
+| Debug Mode | Boolean | Generate reports in debug mode (HTML output) | False |
+| Test Reports | Boolean | Enable generation of test reports | False |
+
 ### Parts
 
 Configuration of Part options
@@ -58,14 +81,36 @@ Configuration of Part Category options
 
 Configuration of Stock Item options
 
+| Setting | Type | Description | Default |
+| --- | --- | --- | --- |
+| Stock Expiry | Boolean | Enable stock expiry functionality | False |
+| Stock Stale Time | Days | Number of days stock items are considered stale before expiring | 90 |
+| Sell Expired Stock | Boolean | Allow sale of expired stock | False |
+| Build Expired Stock | Boolean | Allow building with expired stock | False |
+| Stock Ownership Control | Boolean | Enable ownership control functionality | False |
+
 ### Build Orders
 
 Options for build orders
 
+| Setting | Type | Description | Default |
+| --- | --- | --- | --- |
+| Reference Prefix | String | Prefix for build order reference | BO |
+| Reference Regex | String | Regular expression pattern for build order reference | *blank* |
+
 ### Purchase Orders
 
 Options for purchase orders
 
+| Setting | Type | Description | Default |
+| --- | --- | --- | --- |
+| Reference Prefix | String | Prefix for purchase order reference | PO |
+
+
 ### Sales orders
 
-Options for sales orders
\ No newline at end of file
+Options for sales orders
+
+| Setting | Type | Description | Default |
+| --- | --- | --- | --- |
+| Reference Prefix | String | Prefix for sales order reference | SO |
diff --git a/docs/settings/user.md b/docs/settings/user.md
index 415a1f6..7106ae8 100644
--- a/docs/settings/user.md
+++ b/docs/settings/user.md
@@ -10,24 +10,41 @@ User settings are arranged in the following categories:
 
 ### Account
 
-User account configuration
+User account configuration, including:
+
+- Account management
+- Session management
+- Authentication options
+- Theme selection
+- Language selection
 
 ### Home Page
 
 Customize display of items on the InvenTree home page
 
+
 ### Search
 
 Customize settings for search results
 
+| Setting | Type | Description | Default |
+| --- | --- | --- | --- |
+| Search Preview Results | Integer | Number of results to show in search preview window | 10 |
+| Search Show Stock | Boolean | Display stock levels in part search results | True |
+| Hide Inactive Parts | Boolean | Hide inactive parts in search preview | False |
+
 ### Labels
 
 Settings for label printing
 
+| Setting | Type | Description | Default |
+| --- | --- | --- | --- |
+| Inline Label Display | Boolean | Display PDF labels in the browser | True |
+
 ### Reports
 
 Settings for report generation
 
-### Forms
-
-Customize behavior of modal forms
+| Setting | Type | Description | Default |
+| --- | --- | --- | --- |
+| Inline Report Display | Boolean | Display PDF reports in the browser | False |