Removed circular dependency between Email & User clusters