Route through eshelf to make sure we save tmp records to the current user on login :cow: