1 files changed, 11 insertions, 11 deletions
diff --git a/rt/share/html/Ticket/Elements/AddWatchers b/rt/share/html/Ticket/Elements/AddWatchers
index 594574e29..4093c26ce 100755
--- a/rt/share/html/Ticket/Elements/AddWatchers
+++ b/rt/share/html/Ticket/Elements/AddWatchers
@@ -69,7 +69,7 @@
 <&|/l&>Group</&>
 </td></tr>
 % while (my $g = $Groups->Next ) {
-<tr><td><&/Elements/SelectWatcherType, Name => "Ticket-AddWatcher-Principal-".$g->PrincipalId, Scope => 'queue' &></td><td><%$g->Name%> (<%$g->Description%>)</td></tr>
+<tr><td><&/Elements/SelectWatcherType, Name => "Ticket-AddWatcher-Principal-".$g->PrincipalId &></td><td><%$g->Name%> (<%$g->Description%>)</td></tr>
 % }
 % }
 
@@ -84,7 +84,7 @@
 <tr><td>
 <&/Elements/SelectWatcherType, Name => "WatcherTypeEmail".$counter &>
 </td><td>
-<input type="hidden" name="WatcherAddressEmail<%$counter%>" value="<%$email->address%>">
+<input type="hidden" name="WatcherAddressEmail<%$counter%>" value="<%$email->format%>">
 <%$email->format%>
 </td></tr>
 % }
@@ -110,24 +110,24 @@ my ($Users, $Groups);
 
 if ($UserString) {
     $Users = RT::Users->new($session{'CurrentUser'});
-    $Users->Limit(FIELD => $UserField, VALUE => $UserString, OPERATOR => $UserOp);
+    $Users->Limit(FIELD => $UserField, VALUE => $UserString, OPERATOR => $UserOp, CASESENSITIVE => 0);
     $Users->LimitToPrivileged if $PrivilegedOnly;
-     }
+}
 
 if ($GroupString) {
     $Groups = RT::Groups->new($session{'CurrentUser'});
-    $Groups->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined');
-    $Groups->Limit(FIELD => $GroupField, VALUE => $GroupString, OPERATOR => $GroupOp);
-     }
+    $Groups->LimitToUserDefinedGroups;
+    $Groups->Limit(FIELD => $GroupField, VALUE => $GroupString, OPERATOR => $GroupOp, CASESENSITIVE => 0);
+}
 
 my @extras;
 for my $addr ( values %{$Ticket->TransactionAddresses} ) {
     my $is_watcher;
     for my $type ( qw/Owner Requestor Cc AdminCc/ ) {
-         if ($Ticket->IsWatcher( Email => $addr->address, Type => $type )) {
-             $is_watcher = 1;
-             last;
-         }
+        if ($Ticket->IsWatcher( Email => $addr->address, Type => $type )) {
+            $is_watcher = 1;
+            last;
+        }
     }
     push @extras, $addr unless $is_watcher;
 }