diff --git a/dba/appuser_permissions.txt b/dba/appuser_permissions.txt
index bcd5b90f..eadd3280 100644
--- a/dba/appuser_permissions.txt
+++ b/dba/appuser_permissions.txt
@@ -26,6 +26,7 @@ GRANT SELECT,INSERT,UPDATE,DELETE
   ON freebusy_ticket
   ON usr
   ON usr_setting
+  ON usr_emails
   ON roles
   ON role_member
   ON session
diff --git a/dba/patches/1.3.4.sql b/dba/patches/1.3.4.sql
index 0b2f1e0e..b947ad4e 100644
--- a/dba/patches/1.3.4.sql
+++ b/dba/patches/1.3.4.sql
@@ -27,7 +27,7 @@ INSERT INTO usr_emails (user_no, email)
     SELECT user_no, email FROM usr WHERE email IS NOT NULL AND email <> '';
 
 ALTER TABLE usr
-    DROP COLUMN email;
+    DROP COLUMN email CASCADE;
 
 -- http://blogs.transparent.com/polish/names-of-the-months-and-their-meaning/
 SELECT new_db_revision(1,3,4, 'Kwiecień' );
diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php
index 4472ea10..5e542630 100644
--- a/inc/ui/principal-edit.php
+++ b/inc/ui/principal-edit.php
@@ -602,8 +602,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' );