Fix a couple of issues with LastUserField