Fixed issue where a Manager can not add employee because of @CheckPassword constraints.
Resolve conflict from Step6 and master