force user-entity association
Merge branch 'user_entity'