--- sites/all/modules/og_forum/og_forum.module	2008-12-16 16:26:04.000000000 -0500
+++ sites/all/modules/og_forum/og_forumNew.module	2008-12-16 16:30:56.000000000 -0500
@@ -504,12 +504,7 @@ function theme_og_forum_topic_list($tid,
   return $output;
 } // function theme_og_forum_topic_list()
 
-/**
- * Implementation of hook_settings().
- */
 function og_forum_admin_settings() {
-  $form['#submit']['og_forum_settings_submit'] = array(); // custom submit handler
-  $form['#submit']['system_settings_form_submit'] = array(); // we just overrode the standard submit, but still want it to fire too
   $form['update'] = array(
     '#type' => 'fieldset',
     '#title' => t('Retroactively update old groups'),
@@ -622,13 +617,16 @@ function og_forum_admin_settings() {
     '#description' => t('Set the number of forums a container can have. 0 means no limit. 1 means groups can only have the default "General Discussion" forum.'),
     '#default_value' => $forum_limit,
   );
-  return system_settings_form($form);
+  $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') );
+  $form['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults') );
+  
+  return $form;
 } // function og_forum_admin_settings()
 
 /**
- * Custom submit handler for group update
+ * Submit handler for group update
  */
-function og_forum_settings_submit($form_id, $form_values) {
+function og_forum_admin_settings_submit($form_id, $form_values) {
   if ($form_values['op'] == t('Update old groups')) {
     og_forum_retroactively_apply();
   }