diff --git a/include/class.config.php b/include/class.config.php
index 3726309876cf198d317e81e7988a7aa9f53476d5..0a458764f65986e574a7d18a09d3994541c58443 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -141,7 +141,7 @@ class OsticketConfig extends Config {
 
     var $defaults = array(
         'allow_pw_reset' =>     true,
-        'pw_reset_mins' =>      30,
+        'pw_reset_window' =>    30,
     );
 
     function OsticketConfig($section=null) {
diff --git a/setup/test/tests/test.undefinedmethods.php b/setup/test/tests/test.undefinedmethods.php
index d5a0f6526697638f7dbc2abd7bdcf76594cbb450..4d22d1aafed62fcfe6d1b68dc985a03db6020343 100644
--- a/setup/test/tests/test.undefinedmethods.php
+++ b/setup/test/tests/test.undefinedmethods.php
@@ -10,8 +10,8 @@ class UndefinedMethods extends Test {
         foreach ($scripts as $s) {
             $matches = array();
             preg_match_all('/^\s*(?:\/\*[^*]*\*\/)?\s*'
-                    .'(?:private|public|static|abstract)?\s*'
-                    .'function\s+&?\s*([^(\s]+)\s*\\(/m',
+                    .'(?:(?:private|public|protected|static|abstract)\s+)*'
+                    .'function\s+&?\s*([^(\s]+)\s*\(/m',
                 file_get_contents($s), $matches);
             $function_defs = array_merge($function_defs, $matches[1]);
         }