diff --git a/lib/form.php b/lib/form.php
index 6a181f7951..ee97f7a32f 100644
--- a/lib/form.php
+++ b/lib/form.php
@@ -91,7 +91,9 @@ class Form extends Widget
 
     function sessionToken()
     {
-        $this->out->hidden('token-' . $this->id() ?: common_random_hexstr(3), common_session_token(), 'token');
+        if (strtolower($this->method()) == 'post') {
+            $this->out->hidden('token-' . $this->id() ?: common_random_hexstr(3), common_session_token(), 'token');
+        }
     }
 
     /**
diff --git a/lib/searchform.php b/lib/searchform.php
index 02ccbc302d..9d6b40e363 100644
--- a/lib/searchform.php
+++ b/lib/searchform.php
@@ -106,9 +106,4 @@ class SearchForm extends Form
     {
         return 'get';
     }
-
-    function sessionToken()
-    {
-        return;
-    }
 }