fixing membership association issue: adding the modifications for the User model as well.