Default user / group key now used properly