Merge "Fix email showing in AccountLink instead of names"