--- ./share/html/Ticket/Elements/ShowTransaction.orig	Fri Sep 22 17:11:09 2006
+++ ./share/html/Ticket/Elements/ShowTransaction	Fri Sep 22 17:17:58 2006
@@ -49,7 +49,11 @@
 <TD><font size=-2><% $transdate|n %></font>&nbsp;</TD>
 % my $desc = $Transaction->BriefDescription;
 % $m->comp('/Elements/Callback', _CallbackName => 'ModifyDisplay', text => \$desc, Transaction => $Transaction, %ARGS);
+% if ($Transaction->CreatorObj->RealName ne $Transaction->CreatorObj->Name) {
+<TD ALIGN="LEFT"><b><%$Transaction->CreatorObj->RealName%> (<%$Transaction->CreatorObj->Name%>) - <%$TicketString%> <%$desc%>
+% } else {
 <TD ALIGN="LEFT"><b><%$Transaction->CreatorObj->Name%> - <%$TicketString%> <%$desc%>
+% }
 
 </b></TD>
 <TD><%$TimeTaken%>&nbsp;</TD>
--- ./share/html/Ticket/Elements/ShowUserEntry.orig	Fri Sep 22 17:25:12 2006
+++ ./share/html/Ticket/Elements/ShowUserEntry	Fri Sep 22 17:29:02 2006
@@ -45,11 +45,13 @@
 %# END BPS TAGGED BLOCK }}}
 %# Released under the terms of version 2 of the GNU Public License
 
-<%$User->Name%>
+<%$User->RealName%>
 % if ($User->EmailAddress && $User->EmailAddress ne $User->Name) {
 &lt;<%$User->EmailAddress%>&gt;
+% } elsif ($User->Name ne $User->RealName) {
+(<%$User->Name%>)
 % }
 
 <%ARGS>
 $User => undef
-</%ARGS>
\ No newline at end of file
+</%ARGS>
--- ./share/html/Elements/SelectOwner.orig	Fri Sep 22 17:01:03 2006
+++ ./share/html/Elements/SelectOwner	Fri Sep 22 17:02:22 2006
@@ -54,7 +54,7 @@
 %} elsif ($ValueAttribute eq 'Name') {
     value="<%$User->Name%>"
 %}
-><%$User->Name()%></OPTION>
+><%$User->RealName()%> (<%$User->Name()%>)</OPTION>
 %}
 </SELECT>
 <%INIT>
--- ./share/html/Elements/SelectOwner.orig	Fri Sep 22 17:01:03 2006
+++ ./share/html/Elements/SelectOwner	Fri Sep 22 17:02:22 2006
@@ -54,7 +54,7 @@
 %} elsif ($ValueAttribute eq 'Name') {
     value="<%$User->Name%>"
 %}
-><%$User->Name()%></OPTION>
+><%$User->RealName()%> (<%$User->Name()%>)</OPTION>
 %}
 </SELECT>
 <%INIT>
--- ./share/html/Ticket/Elements/EditWatchers.orig	Fri Sep 22 17:37:55 2006
+++ ./share/html/Ticket/Elements/EditWatchers	Fri Sep 22 17:37:28 2006
@@ -55,7 +55,11 @@
 <INPUT TYPE=CHECKBOX NAME="Ticket-DeleteWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" value="1" UNCHECKED>
 %if ($watcher->MemberObj->IsUser) { 
 <a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->MemberObj->Object->id%>">
+% if ($watcher->MemberObj->Object->Name ne $watcher->MemberObj->Object->RealName) {
+<%$watcher->MemberObj->Object->RealName%> (<%$watcher->MemberObj->Object->Name%>)</a>
+% } else {
 <%$watcher->MemberObj->Object->Name%></a>
+% }
 %} else {
 <a href="<%$RT::WebPath%>/Admin/Groups/Modify.html?id=<%$watcher->MemberObj->Object->id%>">
 <%$watcher->MemberObj->Object->Name%></a>