users bugfixing