Fixes some user loading issues