diff --git a/apachesolr.module b/apachesolr.module
index 762fbfd..da59499 100644
--- a/apachesolr.module
+++ b/apachesolr.module
@@ -1283,7 +1283,11 @@ function apachesolr_get_taxonomy_term_title($search_page_id = NULL, $value = NUL
      $search_page = apachesolr_search_page_load($search_page_id);
      $page_title = str_replace('%value', '@value', $search_page->page_title);
      $term = taxonomy_term_load($value);
+     if(!$term) {
+       return;
+     }
      $title = $term->name;
+
    }
    return t($page_title, array('@value' => $title));
 }
@@ -1298,6 +1302,9 @@ function apachesolr_get_user_title($search_page_id = NULL, $value = NULL) {
     $search_page = apachesolr_search_page_load($search_page_id);
     $page_title = str_replace('%value', '@value', $search_page->page_title);
     $user = user_load($value);
+    if(!$user) {
+       return;
+     }
     $title = $user->name;
   }
   return t($page_title, array('@value' => $title));
diff --git a/apachesolr_search.admin.inc b/apachesolr_search.admin.inc
index 8d89a63..402e666 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,
@@ -270,6 +269,15 @@ 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);
@@ -355,6 +363,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 d011848..1e79d54 100644
--- a/apachesolr_search.install
+++ b/apachesolr_search.install
@@ -15,8 +15,10 @@ function apachesolr_search_install() {
       '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(
@@ -29,7 +31,29 @@ function apachesolr_search_install() {
       'settings' => $settings,
     );
     db_insert('apachesolr_search_page')->fields($fields)->execute();
-    }
+
+    // Add a taxonomy search page to the database
+    $settings = array(
+      'apachesolr_search_search_type' => 'tid',
+      'apachesolr_search_per_page' => 10,
+      'apachesolr_search_browse' => 'results',
+      'apachesolr_search_spellcheck' => FALSE,
+      'apachesolr_search_search_box' => FALSE,
+     );
+    $settings = serialize($settings);
+
+    $fields = array(
+      'page_id' => 'taxonomy_search',
+      'label' => 'Taxonomy Search',
+      'description' => 'Search all items with given term',
+      'search_path' => 'taxonomy/term/%',
+      'env_id' => '',
+      'page_title' => '%value',
+      'settings' => $settings,
+    );
+    db_insert('apachesolr_search_page')->fields($fields)->execute();
+
+  }
 }
 
 /**
@@ -263,8 +287,9 @@ 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);
 
@@ -279,28 +304,30 @@ function apachesolr_search_update_7004() {
   );
   db_insert('apachesolr_search_page')->fields($fields)->execute();
 
+  // Add this taxonomy search page to the database
+  $settings = array(
+    'apachesolr_search_search_type' => 'tid',
+    'apachesolr_search_per_page' => 10,
+    'apachesolr_search_browse' => 'results',
+    'apachesolr_search_spellcheck' => FALSE,
+    'apachesolr_search_search_box' => FALSE,
+   );
+  $settings = serialize($settings);
+
+  $fields = array(
+    'page_id' => 'taxonomy_search',
+    'label' => 'Taxonomy Search',
+    'description' => 'Search all items with given term',
+    'search_path' => 'taxonomy/term/%',
+    'env_id' => '',
+    'page_title' => '%value',
+    'settings' => $settings,
+  );
+  db_insert('apachesolr_search_page')->fields($fields)->execute();
+
   // Check if the taxonomy module was ever present
   $status = db_query("SELECT 1 FROM system WHERE name = 'apachesolr_taxonomy'")->fetchField();
   if($status == 1) {
-    // Add this taxonomy search page to the database
-    $settings = array(
-      'apachesolr_search_search_type' => 'tid',
-      'apachesolr_search_per_page' => 10,
-      'apachesolr_search_browse' => 'results',
-      'apachesolr_search_spellcheck' => 0,
-     );
-    $settings = serialize($settings);
-
-    $fields = array(
-      'page_id' => 'taxonomy_search',
-      'label' => 'Taxonomy Search',
-      'description' => 'Search all items with given term',
-      'search_path' => 'taxonomy/term/%',
-      'env_id' => '',
-      'page_title' => '%value',
-      'settings' => $settings,
-    );
-    db_insert('apachesolr_search_page')->fields($fields)->execute();
     $message  = t('If you had the apachesolr_taxonomy module running please go to the !link and enable the Taxonomy Term page', array('!link' => l('Apache Solr custom pages', 'admin/config/search/apachesolr/search-pages')));
     drupal_set_message($message, 'warning');
   }
diff --git a/apachesolr_search.pages.inc b/apachesolr_search.pages.inc
index abf0495..a51577a 100644
--- a/apachesolr_search.pages.inc
+++ b/apachesolr_search.pages.inc
@@ -86,11 +86,14 @@ 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);
-  // Adds the search results to the page
-  $build['search_results'] = $build_results;
+  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);
+  }
+  if(isset($build_results)) {
+    // Adds the search results to the page
+    $build['search_results'] = $build_results;
+  }
   return $build;
 }