Use basaar User model.
Fix merge