Added EmailAccount restrictions