diff --git a/apachesolr_search.admin.inc b/apachesolr_search.admin.inc
index 99ffffc..add260f 100644
--- a/apachesolr_search.admin.inc
+++ b/apachesolr_search.admin.inc
@@ -23,10 +23,9 @@ function _apachesolr_search_browse_form($default_value) {
     '#type' => 'radios',
     '#title' => t('Behavior on empty search'),
     '#options' => array(
-      'none'    => t("Show search box"),
-      'browse'  => t("Show search box and enabled filters' blocks under the search box"),
-      'blocks'  => t("Show search box and enabled filters' blocks in their configured regions"),
-      'results' => t("Show search box, enabled filters' blocks in their configured regions and first page of all available results"),
+      'browse'  => t("Show enabled filters' blocks under the search box"),
+      'blocks'  => t("Show enabled filters' blocks in their configured regions"),
+      'results' => t("Show enabled filters' blocks in their configured regions and first page of all available results"),
     ),
     '#default_value' => $default_value,
     '#description' => $description,
@@ -263,6 +262,14 @@ function apachesolr_search_page_settings_form($form, &$form_state, $search_page
     '#default_value' => $default_value,
   );
 
+  // Enable/disable search form on search page (replaced by a block perhaps)
+  $default_value = isset($search_page->settings['apachesolr_search_search_box']) ? $search_page->settings['apachesolr_search_search_box'] : TRUE;
+  $form['advanced']['apachesolr_search_search_box'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Enable the on page search box'),
+    '#description' => t('Display a search box on the page.'),
+    '#default_value' => $default_value,
+  );
   // Use the main search page setting as the default for new pages.
   $default_value = isset($search_page->settings['apachesolr_search_browse']) ? $search_page->settings['apachesolr_search_browse'] : variable_get('apachesolr_search_browse', 'browse');
   $form['advanced']['apachesolr_search_browse'] = _apachesolr_search_browse_form($default_value);
@@ -343,6 +350,7 @@ function apachesolr_search_page_settings_form_submit($form, &$form_state) {
     }
   }
   $settings['apachesolr_search_search_type'] = $form_state['values']['search_type'];
+  $settings['apachesolr_search_search_box'] = $form_state['values']['apachesolr_search_search_box'];
   $settings['apachesolr_search_per_page'] = $form_state['values']['apachesolr_search_per_page'];
   $settings['apachesolr_search_browse'] = $form_state['values']['apachesolr_search_browse'];
   $settings['apachesolr_search_spellcheck'] = $form_state['values']['apachesolr_search_spellcheck'];
diff --git a/apachesolr_search.install b/apachesolr_search.install
index 0330803..54478bc 100644
--- a/apachesolr_search.install
+++ b/apachesolr_search.install
@@ -262,8 +262,10 @@ function apachesolr_search_update_7004() {
     'apachesolr_search_search_type' => 'custom',
     'apachesolr_search_per_page' => 10,
     'apachesolr_search_browse' => 'browse',
-    'apachesolr_search_spellcheck' => 1,
-    'apachesolr_search_not_removable' => 1);
+    'apachesolr_search_spellcheck' => TRUE,
+    'apachesolr_search_not_removable' => TRUE,
+    'apachesolr_search_search_box' => TRUE,
+  );
   $settings = serialize($settings);
 
   $fields = array(
diff --git a/apachesolr_search.pages.inc b/apachesolr_search.pages.inc
index abf0495..07908e7 100644
--- a/apachesolr_search.pages.inc
+++ b/apachesolr_search.pages.inc
@@ -86,9 +86,10 @@ function apachesolr_search_user_defined_search_page($page_id, $keys = '', $value
 
   //initiate our build array
   $build = array();
-
-  // Adds the search form to the page.
-  $build['search_form'] = drupal_get_form('apachesolr_search_user_defined_search_form', $search_page, $keys);
+  if(isset($search_page->settings['apachesolr_search_search_box']) && $search_page->settings['apachesolr_search_search_box']) {
+    // Adds the search form to the page.
+    $build['search_form'] = drupal_get_form('apachesolr_search_user_defined_search_form', $search_page, $keys);
+  }
   // Adds the search results to the page
   $build['search_results'] = $build_results;
   return $build;