diff --git a/include/class.filter_action.php b/include/class.filter_action.php
index 7d639d9d186634592d787c79e44605d8493d4554..f5dc14abbc77740d58a368e434603568b6f64fca 100644
--- a/include/class.filter_action.php
+++ b/include/class.filter_action.php
@@ -188,17 +188,18 @@ class FA_UseReplyTo extends TriggerAction {
     static $name = /* @trans */ 'Use Reply-To Email';
 
     function apply(&$ticket, array $info) {
-        if (!$info['reply-to'])
+        if (!$info['reply-to']
+            || !$ticket['email']
+            || !strcasecmp($info['reply-to'], $ticket['email']))
             // Nothing to do
             return;
-        $changed = $info['reply-to'] != $ticket['email']
-            || ($info['reply-to-name'] && $ticket['name'] != $info['reply-to-name']);
-        if ($changed) {
-            $ticket['email'] = $info['reply-to'];
-            if ($info['reply-to-name'])
-                $ticket['name'] = $info['reply-to-name'];
-            throw new FilterDataChanged($ticket);
-        }
+
+        // Change email and  throw data changed exception
+        $ticket['email'] = $info['reply-to'];
+        if ($info['reply-to-name'])
+            $ticket['name'] = $info['reply-to-name'];
+
+        throw new FilterDataChanged($ticket);
     }
 
     function getConfigurationOptions() {
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 642a4911595644af27b3af7fcd148e0201b357ed..caf9f63fa0a6bc853dd691293e6ff4c5f133cd09 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -3001,8 +3001,8 @@ implements RestrictedAccess, Threadable {
             $user_form = UserForm::getUserForm()->getForm($vars);
             // Add all the user-entered info for filtering
             foreach ($interesting as $F) {
-                $field = $user_form->getField($F);
-                $vars[$F] = $field->toString($field->getClean());
+                if ($field = $user_form->getField($F))
+                    $vars[$F] = $field->toString($field->getClean());
             }
             // Attempt to lookup the user and associated data
             $user = User::lookupByEmail($vars['email']);