diff --git a/payment/uc_payment/uc_payment.admin.inc b/payment/uc_payment/uc_payment.admin.inc
index 9306cf1..512c199 100644
--- a/payment/uc_payment/uc_payment.admin.inc
+++ b/payment/uc_payment/uc_payment.admin.inc
@@ -184,7 +184,7 @@ function uc_payment_by_order_form($form, &$form_state, $order) {
         '#markup' => format_date($payment->received, 'custom', variable_get('date_format_uc_store', 'm/d/Y') . '<b\r />H:i:s'),
       );
       $form['payments'][$payment->receipt_id]['user'] = array(
-        '#markup' => theme('uc_uid', $payment->uid),
+        '#markup' => theme('uc_uid', array('uid' => $payment->uid)),
       );
       $form['payments'][$payment->receipt_id]['method'] = array(
         '#markup' => ($payment->method == '') ? t('Unknown') : $payment->method,
diff --git a/uc_order/uc_order.admin.inc b/uc_order/uc_order.admin.inc
index 0f7893a..8198a60 100644
--- a/uc_order/uc_order.admin.inc
+++ b/uc_order/uc_order.admin.inc
@@ -1338,7 +1338,7 @@ function uc_order_log($order) {
 
   foreach ($result as $change) {
     $rows[] = array(
-      'data' => array(format_date($change->created, 'short'), theme('uc_uid', $change->uid), $change->changes),
+      'data' => array(format_date($change->created, 'short'), theme('uc_uid', array('uid' => $change->uid)), $change->changes),
       'valign' => 'top',
     );
   }
diff --git a/uc_order/uc_order.api.php b/uc_order/uc_order.api.php
index 7041e3b..efa560b 100644
--- a/uc_order/uc_order.api.php
+++ b/uc_order/uc_order.api.php
@@ -355,7 +355,7 @@ function uc_order_pane_callback($op, $order, &$form = NULL, &$form_state = NULL)
       $comments = uc_order_comments_load($form['order_id']['#value'], TRUE);
       if (is_array($comments) && count($comments) > 0) {
         foreach ($comments as $comment) {
-          $items[] = '[' . theme('uc_uid', $comment->uid) . '] ' . filter_xss_admin($comment->message);
+          $items[] = '[' . theme('uc_uid', array('uid' => $comment->uid)) . '] ' . filter_xss_admin($comment->message);
         }
       }
       else {
diff --git a/uc_order/uc_order.order_pane.inc b/uc_order/uc_order.order_pane.inc
index 03ad7d3..20d1548 100644
--- a/uc_order/uc_order.order_pane.inc
+++ b/uc_order/uc_order.order_pane.inc
@@ -904,7 +904,7 @@ function uc_order_pane_admin_comments($op, $order, &$form = NULL, &$form_state =
       $comments = uc_order_comments_load($form['order_id']['#value'], TRUE);
       if (is_array($comments) && count($comments) > 0) {
         foreach ($comments as $comment) {
-          $items[] = '[' . theme('uc_uid', $comment->uid) . '] ' . filter_xss_admin($comment->message);
+          $items[] = '[' . theme('uc_uid', array('uid' => $comment->uid)) . '] ' . filter_xss_admin($comment->message);
         }
       }
       else {
@@ -1342,7 +1342,7 @@ function uc_op_order_comments_view_table($comments) {
         '#cell_attributes' => array('align' => 'center'),
       );
       $data['user'] = array(
-        '#markup' => theme('uc_uid', $comment->uid),
+        '#markup' => theme('uc_uid', array('uid' => $comment->uid)),
         '#cell_attributes' => array('align' => 'center'),
       );
       $data['notified'] = array(
@@ -1402,7 +1402,7 @@ function uc_op_admin_comments_view_table($comments) {
         '#cell_attributes' => array('align' => 'center', 'valign' => 'top'),
       );
       $data['user'] = array(
-        '#markup' => theme('uc_uid', $comment->uid),
+        '#markup' => theme('uc_uid', array('uid' => $comment->uid)),
         '#cell_attributes' => array('align' => 'center', 'valign' => 'top'),
       );
       $data['comment'] = array(