Merge pull request #498 from stianst/master

Rename loginName to username
Remove notBefore from users