added logic on manage users and company partially