minor update to user handling