diff --git a/inc/RSCDSUser.php b/inc/RSCDSUser.php
index b690e6c3..2e2b2b4e 100644
--- a/inc/RSCDSUser.php
+++ b/inc/RSCDSUser.php
@@ -125,6 +125,11 @@ class RSCDSUser extends User
     else
       $browser->AddOrder( 'rt_name', 'A' );
 
+    # We always want a secondary sort on fullname.
+    if ( ! isset( $_GET['o'] ) ||
+         ( isset( $_GET['o'] ) && $_GET['o'][0] != 'fullname' ) )
+      $browser->AddOrder( 'fullname', 'A', 0, 1 );
+
     if ( $c->enable_row_linking ) {
       $browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"".translate("Click to display that user")."\" class=\"r%d\">\n", "</tr>\n", '#even' );
     }
@@ -199,10 +204,10 @@ EOSQL;
     $browser->SetWhere( "to_user = $this->user_no" );
 
     if ( isset( $_GET['o']) && isset($_GET['d']) ) {
-      $browser->AddOrder( $_GET['o'], $_GET['d'] );
+      $browser->AddOrder( $_GET['o'], $_GET['d'], 1 );
     }
     else
-      $browser->AddOrder( 'rt_name', 'A' );
+      $browser->AddOrder( 'rt_name', 'A', 1 );
 
     $browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"".translate("Click to display that user")."\" class=\"r%d\">\n", "</tr>\n", '#even' );
     $browser->DoQuery();