Fixing up add/edit users