fix query for :activated user scope
Update/conflate all user scopes in user.rb