fix user model refs, fixes #236