user functionality fix