changed field names for user
Merge branch 'master' of github.com:naagii/mmm