diff --git a/include/class.ticket.php b/include/class.ticket.php
index 53dce9cb9e..1c9b8dda3c 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1903,7 +1903,7 @@ function postCannedReply($canned, $msgId, $alert=true) {
                       'cannedattachments' => $files);
 
         $errors = array();
-        if(!($response=$this->postReply($info, $errors, false)))
+        if (!($response=$this->postReply($info, $errors, false, false)))
             return null;
 
         $this->markUnAnswered();
@@ -1941,11 +1941,10 @@ function postCannedReply($canned, $msgId, $alert=true) {
     }
 
     /* public */
-    function postReply($vars, &$errors, $alert = true) {
+    function postReply($vars, &$errors, $alert=true, $claim=true) {
         global $thisstaff, $cfg;
 
-
-        if(!$vars['poster'] && $thisstaff)
+        if (!$vars['poster'] && $thisstaff)
             $vars['poster'] = $thisstaff;
 
         if(!$vars['staffId'] && $thisstaff)
@@ -1964,10 +1963,11 @@ function postReply($vars, &$errors, $alert = true) {
             $this->setStatus($vars['reply_status_id']);
 
         // Claim on response bypasses the department assignment restrictions
-        if($thisstaff && $this->isOpen() && !$this->getStaffId()
-                && $cfg->autoClaimTickets())
+        if ($claim && $thisstaff && $this->isOpen() && !$this->getStaffId()
+            && $cfg->autoClaimTickets()
+        ) {
             $this->setStaffId($thisstaff->getId()); //direct assignment;
-
+        }
 
         $this->onResponse($response, array('assignee' => $assignee)); //do house cleaning..
 
@@ -2302,7 +2302,7 @@ function lookup($id) { //Assuming local ID is the only lookup used!
     }
 
     function lookupByNumber($number, $email=null) {
-        return self::lookup(self:: getIdByNumber($number, $email));
+        return self::lookup(self::getIdByNumber($number, $email));
     }
 
     static function isTicketNumberUnique($number) {