Add option to set primary group if no current primary group

[sam (Sam Saffron)]

The only simple change I support here is stopping the override, once a primary group is set, stop messing with it