diff --git a/CRM/Contact/DataProcessorContactSearch.php b/CRM/Contact/DataProcessorContactSearch.php
index fa632e1ada929130309a2d2895c9d542fcf1d9ba..3b663515de48873e3c56c9175349601384d19adf 100644
--- a/CRM/Contact/DataProcessorContactSearch.php
+++ b/CRM/Contact/DataProcessorContactSearch.php
@@ -57,7 +57,9 @@ class CRM_Contact_DataProcessorContactSearch implements UIFormOutputInterface {
 
     $form->add('text', 'no_result_text', E::ts('No result text'), array('class' => 'huge'), false);
 
-    $form->add('checkbox', 'expanded_search', E::ts('Expand criteria form initially'));
+    $form->add('checkbox', 'expanded_search', E::ts('Expand criteria form initially?'));
+
+    $form->addYesNo('link_to_view_contact', E::ts('Add link to view contact?'));
 
     // navigation field
     $navigationOptions = $navigation->getNavigationOptions();
@@ -97,6 +99,12 @@ class CRM_Contact_DataProcessorContactSearch implements UIFormOutputInterface {
         if (isset($output['configuration']['expanded_search'])) {
           $defaults['expanded_search'] = $output['configuration']['expanded_search'];
         }
+        if (isset($output['configuration']['link_to_view_contact'])) {
+          $defaults['link_to_view_contact'] = $output['configuration']['link_to_view_contact'];
+        }
+        else {
+          $defaults['link_to_view_contact'] = TRUE;
+        }
       }
     }
     if (!isset($defaults['permission'])) {
@@ -133,6 +141,7 @@ class CRM_Contact_DataProcessorContactSearch implements UIFormOutputInterface {
     $configuration['hide_id_field'] = $submittedValues['hide_id_field'];
     $configuration['help_text'] = $submittedValues['help_text'];
     $configuration['expanded_search'] = isset($submittedValues['expanded_search']) ? $submittedValues['expanded_search'] : false;
+    $configuration['link_to_view_contact'] = $submittedValues['link_to_view_contact'];
     return $configuration;
   }
 
diff --git a/CRM/Contact/Form/DataProcessorContactSearch.php b/CRM/Contact/Form/DataProcessorContactSearch.php
index dadb1145c45e6262c12d8c933e9344ffdd4f3362..53adc846339d794df89712a4cf84f314812672a1 100644
--- a/CRM/Contact/Form/DataProcessorContactSearch.php
+++ b/CRM/Contact/Form/DataProcessorContactSearch.php
@@ -19,28 +19,29 @@ class CRM_Contact_Form_DataProcessorContactSearch extends CRM_DataprocessorSearc
   }
 
   /**
-   * This function could be overriden in child classes to change default configuration.
+   * This function could be overridden in child classes to change default configuration.
    *
    * @param $output
    *
    * @return array
    */
   protected function alterDataProcessorOutput($output) {
-    /*if (!isset($output['configuration']['link_to_view_contact'])) {
+    // link_to_view_contact option was added in 0.12. So we default to TRUE to match previous behaviour
+    if (!isset($output['configuration']['link_to_view_contact'])) {
       $output['configuration']['link_to_view_contact'] = TRUE;
-    }*/
+    }
     return $output;
   }
 
   /**
    * Returns the url for view of the record action
    *
-   * @param $row
+   * @param array $row
    *
-   * @return false|string
+   * @return string
    */
   protected function link($row) {
-    return CRM_Utils_System::url('civicrm/contact/view', 'reset=1&cid='.$row['id']);
+    return CRM_Utils_System::url('civicrm/contact/view', 'reset=1&cid=' . $row['id']);
   }
 
   /**
diff --git a/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl b/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl
index be759b66d1e64eaad5d6fff1458fdf52ec1bd12c..be3baae6af349cb961fc5680e6ef2216407985c7 100644
--- a/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl
+++ b/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl
@@ -36,7 +36,9 @@
                                 {/if}
                             </th>
                         {/foreach}
+                      {if $output.configuration.link_to_view_contact}
                         <th scope="col"></th>
+                      {/if}
                     </tr></thead>
 
 
@@ -51,7 +53,7 @@
                                 {assign var=columnValue value=$record.$headerName}
                                 <td>{$columnValue}</td>
                             {/foreach}
-
+                          {if $output.configuration.link_to_view_contact}
                             <td>
                                 {if ($row.url)}
                                     <a href="{$row.url}">
@@ -59,6 +61,7 @@
                                     </a>
                                 {/if}
                             </td>
+                          {/if}
                         </tr>
                     {/foreach}
 
diff --git a/templates/CRM/Contact/Form/OutputConfiguration/DataProcessorContactSearch.tpl b/templates/CRM/Contact/Form/OutputConfiguration/DataProcessorContactSearch.tpl
index 90e60fd70eb148b7dc2f4a6f5f3e8261527e98fa..fc551ff0076d2e822918ca36373bfb45ba025aff 100644
--- a/templates/CRM/Contact/Form/OutputConfiguration/DataProcessorContactSearch.tpl
+++ b/templates/CRM/Contact/Form/OutputConfiguration/DataProcessorContactSearch.tpl
@@ -29,6 +29,11 @@
       <div class="content">{$form.expanded_search.html}</div>
       <div class="clear"></div>
     </div>
+    <div class="crm-section">
+      <div class="label">{$form.link_to_view_contact.label}</div>
+      <div class="content">{$form.link_to_view_contact.html}</div>
+      <div class="clear"></div>
+    </div>
     <div class="crm-section">
         <div class="label">{$form.help_text.label}</div>
         <div class="content">{$form.help_text.html}</div>