complete login and check user at model level.
Merge origin/master