improve user status handling