ENC-4262: email as username issue.