Fixed a problem with generics
Changes to setting email