diff --git a/lib/sf/account.rb b/lib/sf/account.rb
index 741169a..bbe6679 100644
--- a/lib/sf/account.rb
+++ b/lib/sf/account.rb
@@ -1,7 +1,7 @@
 class Sf::Account
   include Sf::Base
 
-  FIELDS = ['Id', 'Name', 'Member_Type__c', 'Member_Category__c', 'Member_Join_Date__c', 'Status__c', 'Website', 'InCommon_Participant__c', 'iMIS_ID__c']
+  FIELDS = ['Id', 'Name', 'Member_Type__c', 'Member_Category__c', 'Member_Join_Date__c', 'Status__c', 'Website', 'InCommon_Participant__c', 'iMIS_ID__c', 'Membership_Status__c']
   FIELDS_SELECT_STR = FIELDS.join(', ')
   MEMBER_TYPES = ['R&E Network Member', 'University Member', 'Industry Member', 'Affiliate Member']
   MEMBER_TYPES_STR = MEMBER_TYPES.map{|v| "\'#{v}\'"}.join(', ')
@@ -49,7 +49,7 @@ def self.intl_partners
   end
 
   def self.members
-    build_collection Sf.client.query("select #{FIELDS_SELECT_STR} from Account where Member_Type__c IN (#{MEMBER_TYPES_STR}) order by Name")
+    build_collection Sf.client.query("select #{FIELDS_SELECT_STR} from Account where Membership_Status__c = true and Status__c = 'Active' order by Name")
   end
 
   def self.all
@@ -60,7 +60,7 @@ def self.community_orgs
     build_collection Sf.client.query(
       "select #{FIELDS_SELECT_STR} from Account
       where Name='Internet2' or InCommon_Participant__c = true
-      or Member_Type__c IN (#{MEMBER_TYPES_STR})
+      or (Membership_Status__c = true and Status__c = 'Active')
       or Member_Category__c = 'International Partner'
       order by Name"
     )
diff --git a/lib/sf/version.rb b/lib/sf/version.rb
index 30de3e7..7f61923 100644
--- a/lib/sf/version.rb
+++ b/lib/sf/version.rb
@@ -1,3 +1,3 @@
 module Sf
-  VERSION = "0.1.25"
+  VERSION = "0.1.26"
 end