Workaround for Email registration