Fixes up the user generator