diff -burN OpenTRS.orig/Kernel/Output/HTML/Agent.pm OpenTRS/Kernel/Output/HTML/Agent.pm
--- OpenTRS.orig/Kernel/Output/HTML/Agent.pm	Fri Oct 25 02:01:33 2002
+++ OpenTRS/Kernel/Output/HTML/Agent.pm	Thu Dec  5 16:35:10 2002
@@ -586,6 +586,20 @@
 #        Selected => $Self->{ConfigObject}->Get('PhoneDefaultNextState'),
     );
 
+    # get customer/company pair
+    $Param{CID} = $Self->OptionStrgHashRef(
+        Data => {
+          $Self->{DBObject}->GetTableData(
+            What => "id, customer_id, comment",
+            Valid => 0,
+            Clamp => 1,
+            Table => 'customer_user',
+          )
+        },
+        Size => 15,
+        Name => 'Customer ID',
+        CustomerID => $Param{CustomerID},
+    );
 
     # get output back
     return $Self->Output(TemplateFile => 'AgentPhoneNew', Data => \%Param);
@@ -610,6 +624,21 @@
     my $Self = shift;
     my %Param = @_;
 
+    # get customer/company pair
+    $Param{CID} = $Self->OptionStrgHashRef(
+        Data => {
+          $Self->{DBObject}->GetTableData(
+            What => "id, customer_id, comment",
+            Valid => 0,
+            Clamp => 1,
+            Table => 'customer_user',
+          )
+        },
+        Size => 15,
+        Name => 'Customer ID',
+        CustomerID => $Param{CustomerID},
+    );
+
     # create & return output
     return $Self->Output(TemplateFile => 'AgentCustomer', Data => \%Param);
 }
diff -burN OpenTRS.orig/Kernel/Output/HTML/Standard/AgentCustomer.dtl OpenTRS/Kernel/Output/HTML/Standard/AgentCustomer.dtl
--- OpenTRS.orig/Kernel/Output/HTML/Standard/AgentCustomer.dtl	Thu Dec  5 15:22:34 2002
+++ OpenTRS/Kernel/Output/HTML/Standard/AgentCustomer.dtl	Thu Dec  5 16:29:42 2002
@@ -40,8 +40,7 @@
 <input type="hidden" name="QueueID" value="$Data{"QueueID"}">
 <input type="hidden" name="TicketID" value="$Data{"TicketID"}">
 <input type="hidden" name="NextScreen" value="$Data{"NextScreen"}">
-#<input type="text" name="CustomerID" value="$Data{"CustomerID"}">
-  $Data{"UserOption"}
+$Data{"CID"}
 
 <br>
 <input type="submit" value="$Text{"update"}">
diff -burN OpenTRS.orig/Kernel/Output/HTML/Standard/AgentPhoneNew.dtl OpenTRS/Kernel/Output/HTML/Standard/AgentPhoneNew.dtl
--- OpenTRS.orig/Kernel/Output/HTML/Standard/AgentPhoneNew.dtl	Fri Oct 25 15:30:22 2002
+++ OpenTRS/Kernel/Output/HTML/Standard/AgentPhoneNew.dtl	Thu Dec  5 16:34:37 2002
@@ -68,7 +68,7 @@
     <td>$Text{"Subject"}:</td><td><input type="text" name="Subject" value="$Text{"$Config{"PhoneDefaultNewSubject"}"}" size="60"></td>
   </tr>
   <tr>
-    <td>$Text{"Text"}:</td><td>
+    <td valign="top">$Text{"Text"}:</td><td>
 <textarea name="Note" rows="15" cols="60" wrap="$Env{"BrowserWrap"}">
 $Text{"$Config{"PhoneDefaultNewNoteText"}"}
 </textarea>
@@ -78,7 +78,7 @@
     <td>$Text{"Next ticket state"}:</td><td>$Data{"NextStatesStrg"}</td>
   </tr>
   <tr>
-    <td>$Text{"CustomerID"}:</td><td><input type="text" name="CustomerID" value="" size="16"></td>
+    <td valign="top">$Text{"CustomerID"}:</td><td>$Data{"CID"}</td>
   </tr>
   <tr>
     <td>$Text{"Time units"}$Text{"$Config{"TimeUnits"}"}:</td><td><input type="text" name="TimeUnits" value="" size="3"></td>