add constraint on mail address directive and add username directive