diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index 55c582eeda06ee701372ec4a9b719adde6ad7cd9..528ec444edfd866cd0f414be821faff5a9ebd02c 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -388,6 +388,16 @@ class page_action extends tform_actions {
 					}
 				}
 			}
+		} else {
+			if(!empty($global_config['default_remote_dbserver'])) {
+				// Add default remote_ips from Main Configuration.
+				$remote_ips = explode(",", $global_config['default_remote_dbserver']);
+
+				if($this->dataRecord['remote_access'] != 'y'){
+					$this->dataRecord['remote_ips'] = implode(',', $remote_ips);
+					$this->dataRecord['remote_access'] = 'y';
+				}
+			}
 		}
 
 		if ($app->tform->errorMessage == '') {
@@ -478,6 +488,16 @@ class page_action extends tform_actions {
 					}
 				}
 			}
+		} else {
+			if(!empty($global_config['default_remote_dbserver'])) {
+				// Add default remote_ips from Main Configuration.
+				$remote_ips = explode(",", $global_config['default_remote_dbserver']);
+
+				if($this->dataRecord['remote_access'] != 'y'){
+					$this->dataRecord['remote_ips'] = implode(',', $remote_ips);
+					$this->dataRecord['remote_access'] = 'y';
+				}
+			}
 		}
 
 		if ($app->tform->errorMessage == '') {