Make user handling better

A lot better