3 files changed, 6 insertions, 2 deletions
diff --git a/rt/share/html/Elements/CustomerFields b/rt/share/html/Elements/CustomerFields
index 199184b69..d5419d213 100644
--- a/rt/share/html/Elements/CustomerFields
+++ b/rt/share/html/Elements/CustomerFields
@@ -27,7 +27,7 @@ my @customer_fields = ( # ordered
                 my @return = ();
                 foreach my $c (ticket_cust_resolvers($Ticket)) {
                     push @return, \'<A HREF="', $c->HREF, \'">',
-                                  $c->_FreesideURILabel,
+                                  $c->AsString,
                                   \'</A>',
                                   \'<BR>';
                 }
diff --git a/rt/share/html/Ticket/Elements/EditCustomers b/rt/share/html/Ticket/Elements/EditCustomers
index e8aa69edc..cc9956f91 100644
--- a/rt/share/html/Ticket/Elements/EditCustomers
+++ b/rt/share/html/Ticket/Elements/EditCustomers
@@ -38,7 +38,11 @@
 %       }
     </td>
     <td>
+%       if ( $resolver->URI =~ /cust_main/ ) {
       <% $resolver->AsStringLong |n %>
+%       } elsif ( $resolver->URI =~ /cust_svc/ ) {
+      <% $resolver->ShortLink |n %>
+%       }
     </td>
   </tr>
 %     }
diff --git a/rt/share/html/Ticket/Elements/ShowCustomers b/rt/share/html/Ticket/Elements/ShowCustomers
index 175822f52..f9b0133b5 100644
--- a/rt/share/html/Ticket/Elements/ShowCustomers
+++ b/rt/share/html/Ticket/Elements/ShowCustomers
@@ -24,7 +24,7 @@ my %data = $m->comp('Customers', Ticket => $Ticket);
     <td class="value">
       <% $cust->AsStringLong |n %>
 %   foreach my $svc ( @{ $data{cust_svc}{$custnum} || [] } ) {
-      <% $svc->AsString |n %>
+      <% $svc->ShortLink |n %>
       <br>
 %   }
     </td>