Fixes missing non-equipped inventory items when relogging

(the other commits listed here are just fast forwards and aren't really part of the change set if you check the files changed)