Added some more inactive checking, updated customer inactive settings