diff --git a/membership_extension/models/account_move_line.py b/membership_extension/models/account_move_line.py
index 3dc04ecf..e70ad81d 100644
--- a/membership_extension/models/account_move_line.py
+++ b/membership_extension/models/account_move_line.py
@@ -18,6 +18,8 @@ def create(self, vals_list):
         for line in lines:
             if line.move_id.move_type == "out_invoice" and line.product_id.membership:
                 line.membership_lines.write({"state": "waiting"})
+                for partner in line.membership_lines.mapped("partner"):
+                    partner.write({"free_member": False})
         return lines
 
     def unlink(self):
diff --git a/membership_extension/views/res_partner_view.xml b/membership_extension/views/res_partner_view.xml
index d68d83ba..7e09ea1c 100644
--- a/membership_extension/views/res_partner_view.xml
+++ b/membership_extension/views/res_partner_view.xml
@@ -101,6 +101,13 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="membership.view_res_partner_member_filter" />
         <field name="arch" type="xml">
+            <xpath expr="//filter[@name='all_members']" position="attributes">
+                <attribute
+                    name="domain"
+                >[('membership_state', 'in', ['invoiced', 'paid', 'free', 'waiting'])]</attribute>
+                <attribute name="help">Invoiced/Paid/Free/Waiting</attribute>
+                <attribute name="string">Members</attribute>
+            </xpath>
             <xpath expr="//group" position="inside">
                 <filter
                     string="Last Start Month"