diff --git a/boost.admin.inc b/boost.admin.inc
index 6975e0b..daa4367 100644
--- a/boost.admin.inc
+++ b/boost.admin.inc
@@ -1739,11 +1739,16 @@ function &boost_array_find_element_by_key($key, &$form) {
 }
 
 function boost_admin_button_router($number, $first, $form, &$form_state) {
+  // Check if Drupal version is before 6.26 when the FormAPI bug existed which
+  // is worked around below
+  if (version_compare(VERSION, '6.26') > -1) {
+    return TRUE;
+  }
   $value = boost_array_find_element_by_key('op', $form);
   if (strpos($value, (string)$number) != 1) {
     $correct = substr($value, 1, 1);
     if ($first) {
-      watchdog('boost', t('FormAPI Bug Encountered; trying to work around the bug. Given: %given Wanted: %wanted. Are you running an old version of Drupal core? For more information, see: http://drupal.org/node/630000.', array('%given' => $number, '%wanted' => $correct)));
+      watchdog('boost', t('FormAPI Bug Encountered; trying to work around the bug. Given: %given Wanted: %wanted.', array('%given' => $number, '%wanted' => $correct)));
       switch ($correct) {
         case 0:
           boost_clear_cache_submit($form, $form_state, FALSE);