fixed users stuff