Fixed, pick email address as id