removing reset of current tenant after request
uncommenting checking