email approval fixes