diff --git a/include/class.ticket.php b/include/class.ticket.php
index fc7eb1c520d45dfaab47ee3d7cd61db4f78f2eba..bfa23d491f127552e2895c33464eb6d8d9d72995 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1948,6 +1948,10 @@ class Ticket{
             $priorityId=$priorityId?$priorityId:$topic->getPriorityId();
             if($autorespond) $autorespond=$topic->autoRespond();
             $source=$vars['source']?$vars['source']:'Web';
+            if (!isset($vars['staffId']) && $topic->getStaffId())
+                $vars['staffId'] = $topic->getStaffId();
+            elseif (!isset($vars['teamId']) && $topic->getTeamId())
+                $vars['teamId'] = $topic->getTeamId();
         }elseif($vars['emailId'] && !$vars['deptId'] && ($email=Email::lookup($vars['emailId']))) { //Emailed Tickets
             $deptId=$email->getDeptId();
             $priorityId=$priorityId?$priorityId:$email->getPriorityId();