users fix (draft)