[#1] Missed a User replacement

Also remove an unneeded import of User
Merge pull request #3 from akvo/feature/1_fix_user_model_for_1.7

Feature/1 fix user model for 1.7