diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php
index f415755e..e909e9bf 100644
--- a/inc/ui/principal-edit.php
+++ b/inc/ui/principal-edit.php
@@ -594,8 +594,8 @@ function email_browser() {
 
   $browser->SetOrdering( 'email', 'A' );
 
-  $browser->SetJoins( "usr_emails " );
-  $browser->SetWhere( 'user_no = '.$id );
+  $browser->SetJoins( "usr_emails LEFT JOIN dav_principal USING(user_no)" );
+  $browser->SetWhere( 'principal_id = '.$id );
 
   if ( $c->enable_row_linking ) {
     $browser->RowFormat( '<tr onMouseover="LinkHref(this,1);" title="'.translate('Click to edit email').'" class="r%d">', '</tr>', '#even' );