Added explicit support for inactive users