More user panel prep