Refactor to key value instead of login name

I might be wrong, but in this domain looks like loginName is a bit odd.

Makes sense?