diff --git a/include/class.filter.php b/include/class.filter.php
index 396d45050dc06414d9efa9b37f831721a1fe5cf1..289dfdd704fbbb73547d14faa49ada14274a1a7d 100644
--- a/include/class.filter.php
+++ b/include/class.filter.php
@@ -100,7 +100,7 @@ class Filter {
     }
 
     function getCannedResponse() {
-        return $this->ht['canned_response'];
+        return $this->ht['canned_response_id'];
     }
 
     function stopOnMatch(){
@@ -401,7 +401,7 @@ class Filter {
              ',reject_email='.db_input(isset($vars['reject_email'])?1:0).
              ',use_replyto_email='.db_input(isset($vars['use_replyto_email'])?1:0).
              ',disable_autoresponder='.db_input(isset($vars['disable_autoresponder'])?1:0).
-             ',canned_response='.db_input($vars['canned_response']).
+             ',canned_response_id='.db_input($vars['canned_response']).
              ',notes='.db_input($vars['notes']);
        
 
diff --git a/setup/inc/sql/b19dc97d-71e05961.patch.sql b/setup/inc/sql/b19dc97d-b16d6d60.patch.sql
similarity index 82%
rename from setup/inc/sql/b19dc97d-71e05961.patch.sql
rename to setup/inc/sql/b19dc97d-b16d6d60.patch.sql
index 2dde766255c5257e486ab3082b7762b5aa29a459..2420917bfdfd50b1b75e778abc047aa25ccfe1de 100644
--- a/setup/inc/sql/b19dc97d-71e05961.patch.sql
+++ b/setup/inc/sql/b19dc97d-b16d6d60.patch.sql
@@ -5,7 +5,7 @@
  */
 
 ALTER TABLE `%TABLE_PREFIX%email_filter`
-    ADD `canned_response` int(11) unsigned NOT NULL default '0'
+    ADD `canned_response_id` int(11) unsigned NOT NULL default '0'
         AFTER `disable_autoresponder`;
 
 -- Finished with patch
diff --git a/setup/inc/sql/osticket-v1.7-mysql.sql b/setup/inc/sql/osticket-v1.7-mysql.sql
index 54b4b5442d6fc9e070582f181c865eced9c4d097..9d3fa288eca45ccc2b53d445c2c52710f1ce0ce6 100644
--- a/setup/inc/sql/osticket-v1.7-mysql.sql
+++ b/setup/inc/sql/osticket-v1.7-mysql.sql
@@ -237,7 +237,7 @@ CREATE TABLE `%TABLE_PREFIX%email_filter` (
   `reject_email` tinyint(1) unsigned NOT NULL default '0',
   `use_replyto_email` tinyint(1) unsigned NOT NULL default '0',
   `disable_autoresponder` tinyint(1) unsigned NOT NULL default '0',
-  `canned_response` int(11) unsigned NOT NULL default '0',
+  `canned_response_id` int(11) unsigned NOT NULL default '0',
   `email_id` int(10) unsigned NOT NULL default '0',
   `priority_id` int(10) unsigned NOT NULL default '0',
   `dept_id` int(10) unsigned NOT NULL default '0',
diff --git a/setup/inc/sql/osticket-v1.7-mysql.sql.md5 b/setup/inc/sql/osticket-v1.7-mysql.sql.md5
index b9831f7883f451e0eee1a70de0221f61abd4b983..5c68be1d02904ba1ab89108726da629a9394ae99 100644
--- a/setup/inc/sql/osticket-v1.7-mysql.sql.md5
+++ b/setup/inc/sql/osticket-v1.7-mysql.sql.md5
@@ -1 +1 @@
-71e05961fdb7a993a21704ae513512bc
+b16d6d6021962e9e8674b6a81d9609bd  osticket-v1.7-mysql.sql