fixed associations in the user model