User Management updates

Here it comes!  Again!