fix user handling