diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php
index 5282e59711..d2653a1505 100644
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
@@ -1385,10 +1385,16 @@ function search_setting($search) {
                 $comment = api_strtolower(get_lang($setting['comment']));
                 //Try the comment
                 if (strpos($comment, $search) === false) {
-                    continue;
+                    //Try the variable name
+                    if (strpos($setting['variable'], $search) === false) {
+                        continue;                        
+                    } else {
+                        $found = true;       
+                    }                    
                 } else {
                     $found = true;   
-                }         
+                }
+                
             } else {                
                 $found = true;    
             }