Updated repo and packages
Fixed bug in user model