diff --git a/config_override.php b/config_override.php
index d8588616789ed1d591f0789806f7f741689678b8..342360724cc4b99ca1121edc0eac44fa141be26f 100644
--- a/config_override.php
+++ b/config_override.php
@@ -20,4 +20,4 @@ $max_mailboxes = 3;
 $runtime_connectors = array();
 
 //Password Regex for validation
-$password_regex = '^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#\$%\^&\*])(?=.{8,})';
\ No newline at end of file
+$validation_regex = array('password_regex' => '^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#\$%\^&\*])(?=.{8,})');
\ No newline at end of file
diff --git a/include/Webservices/Custom/ChangePassword.php b/include/Webservices/Custom/ChangePassword.php
index 2d37e9b01a349a90b1de011939798baac06115ff..716244b18c8645c1f8404b9b1f5de5b202357fdc 100644
--- a/include/Webservices/Custom/ChangePassword.php
+++ b/include/Webservices/Custom/ChangePassword.php
@@ -76,7 +76,7 @@ function vtws_changePassword($id, $oldPassword, $newPassword, $confirmPassword,
 
 function isPasswordStrong($new_password){
     $runtime_configs = Vtiger_Runtime_Configs::getInstance();
-    $password_regex = $runtime_configs->get('password_regex');
+    $password_regex = $runtime_configs->getValidationRegex('password_regex');
     if (preg_match('/'.$password_regex.'/i', $new_password) == 1) {
             return true;
     }
diff --git a/includes/runtime/Configs.php b/includes/runtime/Configs.php
index 4ab97f2090392ad3e76c20c2bf6f4e0346916d86..1ced96a96301f2210cf034c2cafc7597c95f3b60 100644
--- a/includes/runtime/Configs.php
+++ b/includes/runtime/Configs.php
@@ -45,10 +45,12 @@
     /**
      * Function to fetch the value for given key
      */
-    public function get($key, $default = '') {
+    public function getValidationRegex($key, $default = '') {
+        global $validation_regex;
+        
         $value = '';
-        if(isset($GLOBALS[$key])) {
-            $value = $GLOBALS[$key];
+        if(isset($validation_regex[$key])) {
+            $value = $validation_regex[$key];
         }
 
         if(empty($value) && !empty($default)) {
diff --git a/modules/Install/views/Index.php b/modules/Install/views/Index.php
index 59276d24b4c3a7716d16535d5757fdfed3011658..61097a2adf417a509ec35443e1cc2d7da0b7f8d2 100644
--- a/modules/Install/views/Index.php
+++ b/modules/Install/views/Index.php
@@ -113,7 +113,7 @@ class Install_Index_view extends Vtiger_View_Controller {
 		$viewer->assign('ADMIN_EMAIL', $defaultParameters['admin_email']);
                 
                 $runtime_configs = Vtiger_Runtime_Configs::getInstance();
-                $password_regex = $runtime_configs->get('password_regex');
+                $password_regex = $runtime_configs->getValidationRegex('password_regex');
                 $viewer->assign('PWD_REGEX', $password_regex);
 
 		$viewer->view('Step4.tpl', $moduleName);
diff --git a/modules/Users/views/List.php b/modules/Users/views/List.php
index 122a8ea86c9f36a5750f1223fe1b3d8a9a0d74a9..6daceada7b59aa2eaececf5cd26d395138ff5526 100644
--- a/modules/Users/views/List.php
+++ b/modules/Users/views/List.php
@@ -169,7 +169,7 @@ class Users_List_View extends Settings_Vtiger_List_View {
 		$viewer->assign('SEARCH_DETAILS', $searchParams);
                 
                 $runtime_configs = Vtiger_Runtime_Configs::getInstance();
-                $password_regex = $runtime_configs->get('password_regex');
+                $password_regex = $runtime_configs->getValidationRegex('password_regex');
                 $viewer->assign('PWD_REGEX', $password_regex);
 	}
 
diff --git a/modules/Users/views/PreferenceDetail.php b/modules/Users/views/PreferenceDetail.php
index 49e6be3cfd76e96231b028ef57d5c64e2b5028d7..8df592a4bade5dcef8a54ee074cf44f1e435ae2c 100644
--- a/modules/Users/views/PreferenceDetail.php
+++ b/modules/Users/views/PreferenceDetail.php
@@ -173,7 +173,7 @@ class Users_PreferenceDetail_View extends Vtiger_Detail_View {
 		$viewer->assign('IMAGE_DETAILS', $recordModel->getImageDetails());
 
                 $runtime_configs = Vtiger_Runtime_Configs::getInstance();
-                $password_regex = $runtime_configs->get('password_regex');
+                $password_regex = $runtime_configs->getValidationRegex('password_regex');
                 $viewer->assign('PWD_REGEX', $password_regex);
 		return parent::process($request);
 	}
diff --git a/modules/Users/views/PreferenceEdit.php b/modules/Users/views/PreferenceEdit.php
index 1ad9ebbba1eb4084f49e7782ec59330912666ec4..108680c552c91ddd9a44efd64fcd978c689fbbf4 100644
--- a/modules/Users/views/PreferenceEdit.php
+++ b/modules/Users/views/PreferenceEdit.php
@@ -152,7 +152,7 @@ Class Users_PreferenceEdit_View extends Vtiger_Edit_View {
 		$viewer->assign('USER_MODEL', Users_Record_Model::getCurrentUserModel());
                 
                 $runtime_configs = Vtiger_Runtime_Configs::getInstance();
-                $password_regex = $runtime_configs->get('password_regex');
+                $password_regex = $runtime_configs->getValidationRegex('password_regex');
                 $viewer->assign('PWD_REGEX', $password_regex);
 
 		parent::process($request);