diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 250f0ec5..ce9a9e88 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -382,6 +382,7 @@ class ModelAdmin_CollectionController extends Controller {
 		//$form->setFormAction(Controller::join_links($this->Link(), "search"));
 		$form->setFormMethod('get');
 		$form->setHTMLID("Form_SearchForm_" . $this->modelClass);
+		$form->disableSecurityToken();
 		$clearAction->useButtonTag = true;
 		$clearAction->addExtraClass('minorAction');
 
@@ -947,7 +948,7 @@ class ModelAdmin_RecordController extends Controller {
 	public function doDelete($data, $form, $request) {
 		if($this->currentRecord->canDelete(Member::currentUser())) {
 			$this->currentRecord->delete();
-			Director::redirect($this->parentController->Link());
+			Director::redirect($this->parentController->Link('SearchForm?action=search'));
 		}
 		else Director::redirectBack();
 		return;