Work on proper user handling