Cleanup user/group defaults

No functional change.
Merge pull request #208 from dirkmueller/release/stoney/master

Cleanup user/group defaults