Fixed issue with email identifier edge case.

USERGRID-1906