diff --git a/src/postorius/tests/fixtures/vcr_cassettes/list_members_access.yaml b/src/postorius/tests/fixtures/vcr_cassettes/list_members_access.yaml
index 21e9537..6f312cc 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/list_members_access.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/list_members_access.yaml
@@ -71,7 +71,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=owner%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -84,7 +84,7 @@
       location: ['http://localhost:9001/3.0/members/9']
     status: {code: 201, message: Created}
 - request:
-    body: list_id=foo.example.com&subscriber=moderator%40example.com&role=moderator
+    body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -179,7 +179,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=owner%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -192,7 +192,7 @@
       location: ['http://localhost:9001/3.0/members/11']
     status: {code: 201, message: Created}
 - request:
-    body: list_id=foo.example.com&subscriber=moderator%40example.com&role=moderator
+    body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -287,7 +287,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=owner%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -300,7 +300,7 @@
       location: ['http://localhost:9001/3.0/members/13']
     status: {code: 201, message: Created}
 - request:
-    body: list_id=foo.example.com&subscriber=moderator%40example.com&role=moderator
+    body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -395,7 +395,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=owner%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -408,7 +408,7 @@
       location: ['http://localhost:9001/3.0/members/15']
     status: {code: 201, message: Created}
 - request:
-    body: list_id=foo.example.com&subscriber=moderator%40example.com&role=moderator
+    body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -565,7 +565,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=owner%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -578,7 +578,7 @@
       location: ['http://localhost:9001/3.0/members/17']
     status: {code: 201, message: Created}
 - request:
-    body: list_id=foo.example.com&subscriber=moderator%40example.com&role=moderator
+    body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/list_members_page.yaml b/src/postorius/tests/fixtures/vcr_cassettes/list_members_page.yaml
index fb1ecd2..1011093 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/list_members_page.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/list_members_page.yaml
@@ -50,21 +50,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/moderator@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "moderator@example.com", "http_etag":
-        "\"ec747dd7d53c1dc2e3dac5df82b3757518dc89d1\"", "original_email": "moderator@example.com",
-        "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/moderator@example.com",
-        "user": "http://localhost:9001/3.0/users/6"}'}
-    headers:
-      content-length: ['297']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/owner@example.com",
@@ -145,21 +130,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/owner@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "owner@example.com", "http_etag": "\"d69637140095e2552943e259d5cfb5258b3acafa\"",
-        "original_email": "owner@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/owner@example.com", "user":
-        "http://localhost:9001/3.0/users/5"}'}
-    headers:
-      content-length: ['285']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/owner@example.com",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription-2.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription-2.yaml
index b18a67a..9ad59cf 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription-2.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription-2.yaml
@@ -15,15 +15,15 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&display_name=None&subscriber=test%40example.com
+    body: display_name=None&list_id=foo.example.com&subscriber=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
     method: !!python/unicode 'POST'
     uri: http://localhost:9001/3.0/members
   response:
-    body: {string: !!python/unicode '{"http_etag": "\"0c768e345f844860cca7d460c3894e7155032582\"",
-        "token": "8cae432078e4ea1c3e4a01dba7d77e870ef72348", "token_owner": "subscriber"}'}
+    body: {string: !!python/unicode '{"http_etag": "\"5ef4b8c02a16638dd9a0b137836fc2e28cfcebce\"",
+        "token": "ba628db5bfe76e0c13963cecc062cf6ac1a9f89e", "token_owner": "subscriber"}'}
     headers:
       content-length: ['143']
       content-type: [application/json; charset=utf-8]
@@ -120,36 +120,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/anotheremail@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "anotheremail@example.com", "http_etag":
-        "\"f9869a7a3dd79521370b25fccfc997d4d91b122d\"", "original_email": "anotheremail@example.com",
-        "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/anotheremail@example.com",
-        "user": "http://localhost:9001/3.0/users/19", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['345']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"display_name": "None", "email": "test@example.com",
-        "http_etag": "\"7e8d41ee53a45beef7f77b7a5209c25bce352646\"", "original_email":
-        "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com",
-        "user": "http://localhost:9001/3.0/users/19"}'}
-    headers:
-      content-length: ['307']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription.yaml
index 87027a5..4d20aae 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription.yaml
@@ -15,7 +15,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: pre_verified=True&list_id=foo.example.com&display_name=None&subscriber=test%40example.com&pre_confirmed=True
+    body: display_name=None&list_id=foo.example.com&pre_confirmed=True&pre_verified=True&subscriber=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -79,21 +79,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"display_name": "None", "email": "test@example.com",
-        "http_etag": "\"a12067f833c53eafe6bfb670bdb75d061a0230c1\"", "original_email":
-        "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com",
-        "user": "http://localhost:9001/3.0/users/12", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['345']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_disable_archiver.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_disable_archiver.yaml
index 764366d..117e166 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_disable_archiver.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_disable_archiver.yaml
@@ -29,11 +29,11 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: mhonarc=True&prototype=True&mail-archive=False
+    body: mail-archive=False
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
-    method: !!python/unicode 'PUT'
+    method: !!python/unicode 'PATCH'
     uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers
   response:
     body: {string: !!python/unicode ''}
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_enable_archiver.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_enable_archiver.yaml
index a9113a2..da77cc8 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_enable_archiver.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_enable_archiver.yaml
@@ -29,11 +29,11 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: mhonarc=True&prototype=True&mail-archive=True
+    body: mail-archive=True
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
-    method: !!python/unicode 'PUT'
+    method: !!python/unicode 'PATCH'
     uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers
   response:
     body: {string: !!python/unicode ''}
@@ -41,11 +41,24 @@
       content-length: ['0']
     status: {code: 204, message: No Content}
 - request:
-    body: mhonarc=False&prototype=True&mail-archive=True
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode 'GET'
+    uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers
+  response:
+    body: {string: !!python/unicode '{"http_etag": "\"3dbbbaad592a043938314db0e5249a1ca71d0dc6\"",
+        "mail-archive": true, "mhonarc": true, "prototype": true}'}
+    headers:
+      content-length: ['119']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: prototype=False
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
-    method: !!python/unicode 'PUT'
+    method: !!python/unicode 'PATCH'
     uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers
   response:
     body: {string: !!python/unicode ''}
@@ -53,11 +66,24 @@
       content-length: ['0']
     status: {code: 204, message: No Content}
 - request:
-    body: mhonarc=False&prototype=False&mail-archive=True
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode 'GET'
+    uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers
+  response:
+    body: {string: !!python/unicode '{"http_etag": "\"dfd159ec866aff2f484eb6399b59057ba112d3e5\"",
+        "mail-archive": true, "mhonarc": true, "prototype": false}'}
+    headers:
+      content-length: ['120']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: mhonarc=False
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
-    method: !!python/unicode 'PUT'
+    method: !!python/unicode 'PATCH'
     uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers
   response:
     body: {string: !!python/unicode ''}
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_creation.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_creation.yaml
index 6ee9400..549f36d 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_creation.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_creation.yaml
@@ -118,7 +118,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=a_new_list.example.com&subscriber=owner%40example.com&role=owner
+    body: list_id=a_new_list.example.com&role=owner&subscriber=owner%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -163,7 +163,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: autorespond_postings=none&collapse_alternatives=True&autoresponse_grace_period=90d&send_welcome_message=True&autorespond_requests=none&convert_html_to_plaintext=False&admin_notify_mchanges=False&posting_pipeline=default-posting-pipeline&reply_goes_to_list=no_munging&autoresponse_request_text=&autoresponse_postings_text=&filter_content=False&description=A+new+list.&welcome_message_uri=mailman%3A%2F%2F%2Fwelcome.txt&autorespond_owner=none&autoresponse_owner_text=&administrivia=True&admin_immed_notify=True&default_member_action=defer&archive_policy=public&allow_list_posts=True&subscription_policy=confirm&display_name=A_new_list&subject_prefix=%5BA_new_list%5D+&anonymous_list=False&default_nonmember_action=hold&advertised=True&digest_size_threshold=30.0&reply_to_address=&include_rfc2369_headers=True&first_strip_reply_to=False
+    body: advertised=True&description=A+new+list.
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_moderator.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_moderator.yaml
index 0210303..68a6c20 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_moderator.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_moderator.yaml
@@ -71,7 +71,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=newmod%40example.com&role=moderator
+    body: list_id=foo.example.com&role=moderator&subscriber=newmod%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner.yaml
index 3e86f78..5b7588d 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner.yaml
@@ -71,7 +71,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=su%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=su%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -181,7 +181,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=su%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=su%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -291,7 +291,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=su%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=su%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_add_remove.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_add_remove.yaml
index 159c4b8..de36a4a 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_add_remove.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_add_remove.yaml
@@ -15,7 +15,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=newowner%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=newowner%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_by_owner.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_by_owner.yaml
index c798e46..4e9843c 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_by_owner.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_by_owner.yaml
@@ -66,21 +66,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/su@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "su@example.com", "http_etag": "\"a8988d233ad4b9e8641ad5d75553912565efec83\"",
-        "original_email": "su@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/su@example.com", "user":
-        "http://localhost:9001/3.0/users/2"}'}
-    headers:
-      content-length: ['276']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/su@example.com",
@@ -122,7 +107,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=newowner%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=newowner%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -228,21 +213,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/su@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "su@example.com", "http_etag": "\"a8988d233ad4b9e8641ad5d75553912565efec83\"",
-        "original_email": "su@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/su@example.com", "user":
-        "http://localhost:9001/3.0/users/2"}'}
-    headers:
-      content-length: ['276']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/newowner@example.com",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_self_last.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_self_last.yaml
index 9bffb33..e7e2278 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_self_last.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_self_last.yaml
@@ -15,7 +15,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=otherowner%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=otherowner%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -138,7 +138,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=su%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=su%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription.yaml
index 35f3261..86e6666 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription.yaml
@@ -104,7 +104,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: autorespond_postings=none&collapse_alternatives=True&autoresponse_grace_period=90d&send_welcome_message=True&autorespond_requests=none&convert_html_to_plaintext=False&admin_notify_mchanges=False&posting_pipeline=default-posting-pipeline&reply_goes_to_list=no_munging&autoresponse_request_text=&autoresponse_postings_text=&filter_content=False&description=&welcome_message_uri=mailman%3A%2F%2F%2Fwelcome.txt&autorespond_owner=none&autoresponse_owner_text=&administrivia=True&admin_immed_notify=True&default_member_action=defer&archive_policy=public&allow_list_posts=True&subscription_policy=open&display_name=Open_list&subject_prefix=%5BOpen_list%5D+&anonymous_list=False&default_nonmember_action=hold&advertised=True&digest_size_threshold=30.0&reply_to_address=&include_rfc2369_headers=True&first_strip_reply_to=False
+    body: subscription_policy=open
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -177,7 +177,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: autorespond_postings=none&collapse_alternatives=True&autoresponse_grace_period=90d&send_welcome_message=True&autorespond_requests=none&convert_html_to_plaintext=False&admin_notify_mchanges=False&posting_pipeline=default-posting-pipeline&reply_goes_to_list=no_munging&autoresponse_request_text=&autoresponse_postings_text=&filter_content=False&description=&welcome_message_uri=mailman%3A%2F%2F%2Fwelcome.txt&autorespond_owner=none&autoresponse_owner_text=&administrivia=True&admin_immed_notify=True&default_member_action=defer&archive_policy=public&allow_list_posts=True&subscription_policy=moderate&display_name=Moderate_subs&subject_prefix=%5BModerate_subs%5D+&anonymous_list=False&default_nonmember_action=hold&advertised=True&digest_size_threshold=30.0&reply_to_address=&include_rfc2369_headers=True&first_strip_reply_to=False
+    body: subscription_policy=moderate
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -189,7 +189,7 @@
       content-length: ['0']
     status: {code: 204, message: No Content}
 - request:
-    body: password=&display_name=&email=test%40example.com
+    body: email=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -246,12 +246,12 @@
     uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/requests
   response:
     body: {string: !!python/unicode '{"entries": [{"display_name": "", "email": "fritz@example.org",
-        "http_etag": "\"973e38504804abf8f80d2767f9e7cd639d555724\"", "list_id": "moderate_subs.example.com",
-        "token": "8d9e4d5e00d8d18405810594db2dd988f6dcf9d2", "token_owner": "moderator",
-        "when": "2005-08-01T07:49:23"}], "http_etag": "\"a0991d2ed272019835300f6407603cb9a77b0495\"",
+        "http_etag": "\"0a06f92e13b074179aea47cc383638ed057373d6\"", "list_id": "moderate_subs.example.com",
+        "token": "e37c5ce90f41b32d1d184aeeb94b35c9d130ab1f", "token_owner": "moderator",
+        "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"ff55df779242fb33ef331e5ca64480b421c76978\"",
         "start": 0, "total_size": 1}'}
     headers:
-      content-length: ['368']
+      content-length: ['392']
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
@@ -260,7 +260,7 @@
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
     method: !!python/unicode 'POST'
-    uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/requests/8d9e4d5e00d8d18405810594db2dd988f6dcf9d2
+    uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/requests/e37c5ce90f41b32d1d184aeeb94b35c9d130ab1f
   response:
     body: {string: !!python/unicode ''}
     headers:
@@ -404,7 +404,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: autorespond_postings=none&collapse_alternatives=True&autoresponse_grace_period=90d&send_welcome_message=True&autorespond_requests=none&convert_html_to_plaintext=False&admin_notify_mchanges=False&posting_pipeline=default-posting-pipeline&reply_goes_to_list=no_munging&autoresponse_request_text=&autoresponse_postings_text=&filter_content=False&description=&welcome_message_uri=mailman%3A%2F%2F%2Fwelcome.txt&autorespond_owner=none&autoresponse_owner_text=&administrivia=True&admin_immed_notify=True&default_member_action=defer&archive_policy=public&allow_list_posts=True&subscription_policy=open&display_name=Open_list&subject_prefix=%5BOpen_list%5D+&anonymous_list=False&default_nonmember_action=hold&advertised=True&digest_size_threshold=30.0&reply_to_address=&include_rfc2369_headers=True&first_strip_reply_to=False
+    body: subscription_policy=open
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -477,7 +477,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: autorespond_postings=none&collapse_alternatives=True&autoresponse_grace_period=90d&send_welcome_message=True&autorespond_requests=none&convert_html_to_plaintext=False&admin_notify_mchanges=False&posting_pipeline=default-posting-pipeline&reply_goes_to_list=no_munging&autoresponse_request_text=&autoresponse_postings_text=&filter_content=False&description=&welcome_message_uri=mailman%3A%2F%2F%2Fwelcome.txt&autorespond_owner=none&autoresponse_owner_text=&administrivia=True&admin_immed_notify=True&default_member_action=defer&archive_policy=public&allow_list_posts=True&subscription_policy=moderate&display_name=Moderate_subs&subject_prefix=%5BModerate_subs%5D+&anonymous_list=False&default_nonmember_action=hold&advertised=True&digest_size_threshold=30.0&reply_to_address=&include_rfc2369_headers=True&first_strip_reply_to=False
+    body: subscription_policy=moderate
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -489,7 +489,7 @@
       content-length: ['0']
     status: {code: 204, message: No Content}
 - request:
-    body: password=&display_name=&email=test%40example.com
+    body: email=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -689,7 +689,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: autorespond_postings=none&collapse_alternatives=True&autoresponse_grace_period=90d&send_welcome_message=True&autorespond_requests=none&convert_html_to_plaintext=False&admin_notify_mchanges=False&posting_pipeline=default-posting-pipeline&reply_goes_to_list=no_munging&autoresponse_request_text=&autoresponse_postings_text=&filter_content=False&description=&welcome_message_uri=mailman%3A%2F%2F%2Fwelcome.txt&autorespond_owner=none&autoresponse_owner_text=&administrivia=True&admin_immed_notify=True&default_member_action=defer&archive_policy=public&allow_list_posts=True&subscription_policy=open&display_name=Open_list&subject_prefix=%5BOpen_list%5D+&anonymous_list=False&default_nonmember_action=hold&advertised=True&digest_size_threshold=30.0&reply_to_address=&include_rfc2369_headers=True&first_strip_reply_to=False
+    body: subscription_policy=open
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -762,7 +762,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: autorespond_postings=none&collapse_alternatives=True&autoresponse_grace_period=90d&send_welcome_message=True&autorespond_requests=none&convert_html_to_plaintext=False&admin_notify_mchanges=False&posting_pipeline=default-posting-pipeline&reply_goes_to_list=no_munging&autoresponse_request_text=&autoresponse_postings_text=&filter_content=False&description=&welcome_message_uri=mailman%3A%2F%2F%2Fwelcome.txt&autorespond_owner=none&autoresponse_owner_text=&administrivia=True&admin_immed_notify=True&default_member_action=defer&archive_policy=public&allow_list_posts=True&subscription_policy=moderate&display_name=Moderate_subs&subject_prefix=%5BModerate_subs%5D+&anonymous_list=False&default_nonmember_action=hold&advertised=True&digest_size_threshold=30.0&reply_to_address=&include_rfc2369_headers=True&first_strip_reply_to=False
+    body: subscription_policy=moderate
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -774,7 +774,7 @@
       content-length: ['0']
     status: {code: 204, message: No Content}
 - request:
-    body: password=&display_name=&email=test%40example.com
+    body: email=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -831,12 +831,12 @@
     uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/requests
   response:
     body: {string: !!python/unicode '{"entries": [{"display_name": "", "email": "test@example.com",
-        "http_etag": "\"4cc4444b718cdf0ed76b1b6cb0ad6e64abe0950f\"", "list_id": "moderate_subs.example.com",
-        "token": "de690150b8110c8808172d6d5ef31c1af32f76ce", "token_owner": "moderator",
-        "when": "2005-08-01T07:49:23"}], "http_etag": "\"742ef324a52073f185baad8155ea692516dbd922\"",
+        "http_etag": "\"937ec6a877c83572ec19fed7d46a5a43cf9576a0\"", "list_id": "moderate_subs.example.com",
+        "token": "8e65d4f061a6a9eea170f02fe8bc12342cd5cdd6", "token_owner": "moderator",
+        "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"08e1bdf6d045feeada1764fe6a1d38a6bd08c3c6\"",
         "start": 0, "total_size": 1}'}
     headers:
-      content-length: ['367']
+      content-length: ['391']
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
@@ -845,7 +845,7 @@
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
     method: !!python/unicode 'POST'
-    uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/requests/de690150b8110c8808172d6d5ef31c1af32f76ce
+    uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/requests/8e65d4f061a6a9eea170f02fe8bc12342cd5cdd6
   response:
     body: {string: !!python/unicode ''}
     headers:
@@ -989,7 +989,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: autorespond_postings=none&collapse_alternatives=True&autoresponse_grace_period=90d&send_welcome_message=True&autorespond_requests=none&convert_html_to_plaintext=False&admin_notify_mchanges=False&posting_pipeline=default-posting-pipeline&reply_goes_to_list=no_munging&autoresponse_request_text=&autoresponse_postings_text=&filter_content=False&description=&welcome_message_uri=mailman%3A%2F%2F%2Fwelcome.txt&autorespond_owner=none&autoresponse_owner_text=&administrivia=True&admin_immed_notify=True&default_member_action=defer&archive_policy=public&allow_list_posts=True&subscription_policy=open&display_name=Open_list&subject_prefix=%5BOpen_list%5D+&anonymous_list=False&default_nonmember_action=hold&advertised=True&digest_size_threshold=30.0&reply_to_address=&include_rfc2369_headers=True&first_strip_reply_to=False
+    body: subscription_policy=open
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -1062,7 +1062,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: autorespond_postings=none&collapse_alternatives=True&autoresponse_grace_period=90d&send_welcome_message=True&autorespond_requests=none&convert_html_to_plaintext=False&admin_notify_mchanges=False&posting_pipeline=default-posting-pipeline&reply_goes_to_list=no_munging&autoresponse_request_text=&autoresponse_postings_text=&filter_content=False&description=&welcome_message_uri=mailman%3A%2F%2F%2Fwelcome.txt&autorespond_owner=none&autoresponse_owner_text=&administrivia=True&admin_immed_notify=True&default_member_action=defer&archive_policy=public&allow_list_posts=True&subscription_policy=moderate&display_name=Moderate_subs&subject_prefix=%5BModerate_subs%5D+&anonymous_list=False&default_nonmember_action=hold&advertised=True&digest_size_threshold=30.0&reply_to_address=&include_rfc2369_headers=True&first_strip_reply_to=False
+    body: subscription_policy=moderate
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -1074,7 +1074,7 @@
       content-length: ['0']
     status: {code: 204, message: No Content}
 - request:
-    body: password=&display_name=&email=test%40example.com
+    body: email=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -1274,7 +1274,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: autorespond_postings=none&collapse_alternatives=True&autoresponse_grace_period=90d&send_welcome_message=True&autorespond_requests=none&convert_html_to_plaintext=False&admin_notify_mchanges=False&posting_pipeline=default-posting-pipeline&reply_goes_to_list=no_munging&autoresponse_request_text=&autoresponse_postings_text=&filter_content=False&description=&welcome_message_uri=mailman%3A%2F%2F%2Fwelcome.txt&autorespond_owner=none&autoresponse_owner_text=&administrivia=True&admin_immed_notify=True&default_member_action=defer&archive_policy=public&allow_list_posts=True&subscription_policy=open&display_name=Open_list&subject_prefix=%5BOpen_list%5D+&anonymous_list=False&default_nonmember_action=hold&advertised=True&digest_size_threshold=30.0&reply_to_address=&include_rfc2369_headers=True&first_strip_reply_to=False
+    body: subscription_policy=open
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -1347,7 +1347,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: autorespond_postings=none&collapse_alternatives=True&autoresponse_grace_period=90d&send_welcome_message=True&autorespond_requests=none&convert_html_to_plaintext=False&admin_notify_mchanges=False&posting_pipeline=default-posting-pipeline&reply_goes_to_list=no_munging&autoresponse_request_text=&autoresponse_postings_text=&filter_content=False&description=&welcome_message_uri=mailman%3A%2F%2F%2Fwelcome.txt&autorespond_owner=none&autoresponse_owner_text=&administrivia=True&admin_immed_notify=True&default_member_action=defer&archive_policy=public&allow_list_posts=True&subscription_policy=moderate&display_name=Moderate_subs&subject_prefix=%5BModerate_subs%5D+&anonymous_list=False&default_nonmember_action=hold&advertised=True&digest_size_threshold=30.0&reply_to_address=&include_rfc2369_headers=True&first_strip_reply_to=False
+    body: subscription_policy=moderate
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -1359,7 +1359,7 @@
       content-length: ['0']
     status: {code: 204, message: No Content}
 - request:
-    body: password=&display_name=&email=test%40example.com
+    body: email=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_primary.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_primary.yaml
index 4f85c31..dbe1a58 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_primary.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_primary.yaml
@@ -23,8 +23,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"db3c3632c621ca80b4d2ee39215bc03b69797be9\"", "is_server_owner": false,
-        "password": "$6$rounds=710743$SGFjdffflaYjwzNJ$HrEYmwJlOydkZAvtViQimEhF7wYTSjlj95ANojFQ7nk4dqdbqvOg3VlKbflR1kWjjLn16hfFnSJLwEZk1sUje0",
+        "\"739541064746f57a1e7f11125e22a0bc9014fa20\"", "is_server_owner": false,
+        "password": "$6$rounds=683624$wpa8XYtDnGTv6XH/$30vzQOIJPB3xuhOiJgtS.x4sifH2PBoqfiJM540czTIqk6I1Pmc0YfZDSARcSxUnp/GmHF3TldC.prCq9CgJA/",
         "self_link": "http://localhost:9001/3.0/users/9", "user_id": 9}'}
     headers:
       content-length: ['324']
@@ -55,36 +55,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/fritz@example.org
-  response:
-    body: {string: !!python/unicode '{"email": "fritz@example.org", "http_etag": "\"8d3a06e7ab49e4715967bd3b56099967748b6868\"",
-        "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", "user":
-        "http://localhost:9001/3.0/users/9", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['323']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"83c6dfb813c2b4484f0c15eb434e104521bb2409\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/9"}'}
-    headers:
-      content-length: ['282']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
@@ -107,15 +77,15 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: pre_verified=True&list_id=moderate_subs.example.com&display_name=None&subscriber=test%40example.com&pre_confirmed=True
+    body: display_name=None&list_id=moderate_subs.example.com&pre_confirmed=True&pre_verified=True&subscriber=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
     method: !!python/unicode 'POST'
     uri: http://localhost:9001/3.0/members
   response:
-    body: {string: !!python/unicode '{"http_etag": "\"840e7db6bceb4e906b43b98ce5bbdd0caefc3329\"",
-        "token": "de690150b8110c8808172d6d5ef31c1af32f76ce", "token_owner": "moderator"}'}
+    body: {string: !!python/unicode '{"http_etag": "\"2dcad56af0194465915d5d4add9e9b8c61d18ccd\"",
+        "token": "8e65d4f061a6a9eea170f02fe8bc12342cd5cdd6", "token_owner": "moderator"}'}
     headers:
       content-length: ['142']
       content-type: [application/json; charset=utf-8]
@@ -141,12 +111,12 @@
     uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/requests
   response:
     body: {string: !!python/unicode '{"entries": [{"display_name": "", "email": "test@example.com",
-        "http_etag": "\"4cc4444b718cdf0ed76b1b6cb0ad6e64abe0950f\"", "list_id": "moderate_subs.example.com",
-        "token": "de690150b8110c8808172d6d5ef31c1af32f76ce", "token_owner": "moderator",
-        "when": "2005-08-01T07:49:23"}], "http_etag": "\"742ef324a52073f185baad8155ea692516dbd922\"",
+        "http_etag": "\"937ec6a877c83572ec19fed7d46a5a43cf9576a0\"", "list_id": "moderate_subs.example.com",
+        "token": "8e65d4f061a6a9eea170f02fe8bc12342cd5cdd6", "token_owner": "moderator",
+        "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"08e1bdf6d045feeada1764fe6a1d38a6bd08c3c6\"",
         "start": 0, "total_size": 1}'}
     headers:
-      content-length: ['367']
+      content-length: ['391']
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
@@ -173,8 +143,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"db3c3632c621ca80b4d2ee39215bc03b69797be9\"", "is_server_owner": false,
-        "password": "$6$rounds=710743$SGFjdffflaYjwzNJ$HrEYmwJlOydkZAvtViQimEhF7wYTSjlj95ANojFQ7nk4dqdbqvOg3VlKbflR1kWjjLn16hfFnSJLwEZk1sUje0",
+        "\"739541064746f57a1e7f11125e22a0bc9014fa20\"", "is_server_owner": false,
+        "password": "$6$rounds=683624$wpa8XYtDnGTv6XH/$30vzQOIJPB3xuhOiJgtS.x4sifH2PBoqfiJM540czTIqk6I1Pmc0YfZDSARcSxUnp/GmHF3TldC.prCq9CgJA/",
         "self_link": "http://localhost:9001/3.0/users/9", "user_id": 9}'}
     headers:
       content-length: ['324']
@@ -206,36 +176,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/fritz@example.org
-  response:
-    body: {string: !!python/unicode '{"email": "fritz@example.org", "http_etag": "\"8d3a06e7ab49e4715967bd3b56099967748b6868\"",
-        "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", "user":
-        "http://localhost:9001/3.0/users/9", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['323']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"2afcbb8fefb40767dad968ef1e48b3878327fd41\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/9", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['320']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_secondary.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_secondary.yaml
index 7dace24..99996b1 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_secondary.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_secondary.yaml
@@ -23,8 +23,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"08ad27d534768fe62a10c2cb5add0e8550515298\"", "is_server_owner": false,
-        "password": "$6$rounds=624682$/5YtXsq8EMMqIXQC$utsg2RrBFXY0LcctTF/bGp3UCZrmkhn2aQYOKaayg4oAxMJNJczA.u7ITsQrIDdpColz7xbBEIaYc5MFdhsBr/",
+        "\"6ecdfd8355bccc05a93dc44aeffbfec86c689b55\"", "is_server_owner": false,
+        "password": "$6$rounds=685702$4PWBkI8pIWfBeBgM$WpQhbOBYk.h3uSJcEnhSI5JThqDKAa7OSf4Svs9/holRnpG2gueJVttdAHnnJz2iWjbugEWrqhecE5iWJ/xxK0",
         "self_link": "http://localhost:9001/3.0/users/7", "user_id": 7}'}
     headers:
       content-length: ['324']
@@ -55,36 +55,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/fritz@example.org
-  response:
-    body: {string: !!python/unicode '{"email": "fritz@example.org", "http_etag": "\"544d5d4924c00a67b82f8d7cddaa5d2ccfd25bb9\"",
-        "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", "user":
-        "http://localhost:9001/3.0/users/7", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['323']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"deab7596aa4fed8d7db92cd9fc477a4e0fa412f6\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/7"}'}
-    headers:
-      content-length: ['282']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
@@ -107,15 +77,15 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: pre_verified=True&list_id=moderate_subs.example.com&display_name=None&subscriber=fritz%40example.org&pre_confirmed=True
+    body: display_name=None&list_id=moderate_subs.example.com&pre_confirmed=True&pre_verified=True&subscriber=fritz%40example.org
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
     method: !!python/unicode 'POST'
     uri: http://localhost:9001/3.0/members
   response:
-    body: {string: !!python/unicode '{"http_etag": "\"646674d989d9d43e346cccafece39fae6e73223a\"",
-        "token": "8d9e4d5e00d8d18405810594db2dd988f6dcf9d2", "token_owner": "moderator"}'}
+    body: {string: !!python/unicode '{"http_etag": "\"d5cd0c73acd682a31a46fe1bbfc20f6ef346f922\"",
+        "token": "e37c5ce90f41b32d1d184aeeb94b35c9d130ab1f", "token_owner": "moderator"}'}
     headers:
       content-length: ['142']
       content-type: [application/json; charset=utf-8]
@@ -141,12 +111,12 @@
     uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/requests
   response:
     body: {string: !!python/unicode '{"entries": [{"display_name": "", "email": "fritz@example.org",
-        "http_etag": "\"973e38504804abf8f80d2767f9e7cd639d555724\"", "list_id": "moderate_subs.example.com",
-        "token": "8d9e4d5e00d8d18405810594db2dd988f6dcf9d2", "token_owner": "moderator",
-        "when": "2005-08-01T07:49:23"}], "http_etag": "\"a0991d2ed272019835300f6407603cb9a77b0495\"",
+        "http_etag": "\"0a06f92e13b074179aea47cc383638ed057373d6\"", "list_id": "moderate_subs.example.com",
+        "token": "e37c5ce90f41b32d1d184aeeb94b35c9d130ab1f", "token_owner": "moderator",
+        "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"ff55df779242fb33ef331e5ca64480b421c76978\"",
         "start": 0, "total_size": 1}'}
     headers:
-      content-length: ['368']
+      content-length: ['392']
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
@@ -173,8 +143,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"08ad27d534768fe62a10c2cb5add0e8550515298\"", "is_server_owner": false,
-        "password": "$6$rounds=624682$/5YtXsq8EMMqIXQC$utsg2RrBFXY0LcctTF/bGp3UCZrmkhn2aQYOKaayg4oAxMJNJczA.u7ITsQrIDdpColz7xbBEIaYc5MFdhsBr/",
+        "\"6ecdfd8355bccc05a93dc44aeffbfec86c689b55\"", "is_server_owner": false,
+        "password": "$6$rounds=685702$4PWBkI8pIWfBeBgM$WpQhbOBYk.h3uSJcEnhSI5JThqDKAa7OSf4Svs9/holRnpG2gueJVttdAHnnJz2iWjbugEWrqhecE5iWJ/xxK0",
         "self_link": "http://localhost:9001/3.0/users/7", "user_id": 7}'}
     headers:
       content-length: ['324']
@@ -205,36 +175,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/fritz@example.org
-  response:
-    body: {string: !!python/unicode '{"email": "fritz@example.org", "http_etag": "\"544d5d4924c00a67b82f8d7cddaa5d2ccfd25bb9\"",
-        "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", "user":
-        "http://localhost:9001/3.0/users/7", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['323']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"deab7596aa4fed8d7db92cd9fc477a4e0fa412f6\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/7"}'}
-    headers:
-      content-length: ['282']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_primary.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_primary.yaml
index 83e6e28..83fed6e 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_primary.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_primary.yaml
@@ -23,8 +23,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"ea739c8f3c5eb5c3b319f792f0e214838e51d0d8\"", "is_server_owner": false,
-        "password": "$6$rounds=692759$WXrNsKFBnMpYgPmR$L2ysz1amlSyFOCgpr6zdDeC.thThm6J8AFGJwPQm3OVBYaTjQXKpaUYDHn06A6msTtNEiAM8sA53GoNk1SK0s1",
+        "\"3a30f194bdc856f93b46620b44f11d63317943fd\"", "is_server_owner": false,
+        "password": "$6$rounds=679674$1cQUdtVLkfjbVgGX$dQDh7CLZ6AmXbswwJfgTZvYBTubXlNrli8eqID5c7z9xrvMiyYCAu89xIbHGIP.BPpbdGdDEPm8njXYXksS2l/",
         "self_link": "http://localhost:9001/3.0/users/10", "user_id": 10}'}
     headers:
       content-length: ['326']
@@ -55,36 +55,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/fritz@example.org
-  response:
-    body: {string: !!python/unicode '{"email": "fritz@example.org", "http_etag": "\"df83de584130f7bf666f498f1ee86526580e1e5d\"",
-        "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", "user":
-        "http://localhost:9001/3.0/users/10", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['324']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"653c988d25ef432406061ef93716f4d0679d110c\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/10"}'}
-    headers:
-      content-length: ['283']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
@@ -107,7 +77,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: pre_verified=True&list_id=open_list.example.com&display_name=None&subscriber=test%40example.com&pre_confirmed=True
+    body: display_name=None&list_id=open_list.example.com&pre_confirmed=True&pre_verified=True&subscriber=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -173,8 +143,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"ea739c8f3c5eb5c3b319f792f0e214838e51d0d8\"", "is_server_owner": false,
-        "password": "$6$rounds=692759$WXrNsKFBnMpYgPmR$L2ysz1amlSyFOCgpr6zdDeC.thThm6J8AFGJwPQm3OVBYaTjQXKpaUYDHn06A6msTtNEiAM8sA53GoNk1SK0s1",
+        "\"3a30f194bdc856f93b46620b44f11d63317943fd\"", "is_server_owner": false,
+        "password": "$6$rounds=679674$1cQUdtVLkfjbVgGX$dQDh7CLZ6AmXbswwJfgTZvYBTubXlNrli8eqID5c7z9xrvMiyYCAu89xIbHGIP.BPpbdGdDEPm8njXYXksS2l/",
         "self_link": "http://localhost:9001/3.0/users/10", "user_id": 10}'}
     headers:
       content-length: ['326']
@@ -206,36 +176,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/fritz@example.org
-  response:
-    body: {string: !!python/unicode '{"email": "fritz@example.org", "http_etag": "\"df83de584130f7bf666f498f1ee86526580e1e5d\"",
-        "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", "user":
-        "http://localhost:9001/3.0/users/10", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['324']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"1a4e4fafa5f557004d12321255ecbe22b7bc4939\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/10", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['321']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_secondary.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_secondary.yaml
index 82a517e..be6f5f6 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_secondary.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_secondary.yaml
@@ -23,8 +23,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"39ba94261fad054ceb0cb44bd894a8e1c5139e58\"", "is_server_owner": false,
-        "password": "$6$rounds=675214$SQfFoRtnCfHoOjtb$iJGAfecnyum9HE6y9K1F5wNnoqihyKHOcr.1iij91iZkjaPDhF7ECZkQjT1z1S0yWQmng2OEvcR/VpkzlhbLN/",
+        "\"59457b60648550d547ab9ae2bb5b13e07bf49ac0\"", "is_server_owner": false,
+        "password": "$6$rounds=718894$GbbWwfOe.L9dZPto$Ls9C/1gapb71bbFgUhI3VJAnuj6kd0Wg0Zoldn9M1JzpoV.kfMtMKo22d/SfgeObEJqAsekEjzdXgz4EXaQ2v.",
         "self_link": "http://localhost:9001/3.0/users/8", "user_id": 8}'}
     headers:
       content-length: ['324']
@@ -55,36 +55,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/fritz@example.org
-  response:
-    body: {string: !!python/unicode '{"email": "fritz@example.org", "http_etag": "\"daa00b2c01031e3acab906927ca2edd5b5557399\"",
-        "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", "user":
-        "http://localhost:9001/3.0/users/8", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['323']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"ddda9833ea38cea61dbf611f3cf46fd118cba777\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/8"}'}
-    headers:
-      content-length: ['282']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
@@ -107,7 +77,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: pre_verified=True&list_id=open_list.example.com&display_name=None&subscriber=fritz%40example.org&pre_confirmed=True
+    body: display_name=None&list_id=open_list.example.com&pre_confirmed=True&pre_verified=True&subscriber=fritz%40example.org
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -173,8 +143,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"39ba94261fad054ceb0cb44bd894a8e1c5139e58\"", "is_server_owner": false,
-        "password": "$6$rounds=675214$SQfFoRtnCfHoOjtb$iJGAfecnyum9HE6y9K1F5wNnoqihyKHOcr.1iij91iZkjaPDhF7ECZkQjT1z1S0yWQmng2OEvcR/VpkzlhbLN/",
+        "\"59457b60648550d547ab9ae2bb5b13e07bf49ac0\"", "is_server_owner": false,
+        "password": "$6$rounds=718894$GbbWwfOe.L9dZPto$Ls9C/1gapb71bbFgUhI3VJAnuj6kd0Wg0Zoldn9M1JzpoV.kfMtMKo22d/SfgeObEJqAsekEjzdXgz4EXaQ2v.",
         "self_link": "http://localhost:9001/3.0/users/8", "user_id": 8}'}
     headers:
       content-length: ['324']
@@ -205,36 +175,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/fritz@example.org
-  response:
-    body: {string: !!python/unicode '{"email": "fritz@example.org", "http_etag": "\"daa00b2c01031e3acab906927ca2edd5b5557399\"",
-        "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", "user":
-        "http://localhost:9001/3.0/users/8", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['323']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"ddda9833ea38cea61dbf611f3cf46fd118cba777\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/8"}'}
-    headers:
-      content-length: ['282']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_unknown.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_unknown.yaml
index a91715a..a7a911d 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_unknown.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_unknown.yaml
@@ -23,8 +23,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"774baf718c3ef57a6de74f3fb5dabb64adf448e0\"", "is_server_owner": false,
-        "password": "$6$rounds=684393$gr7xhY64Qq34oaid$CbGxn/bFvV5YVDnR8gCPaoi3PkXr/IwvUGaYfeghdYbezpiz6Iy3Hen78NXyCSYWmjrYeq4B7b28fic.bhWVK.",
+        "\"7db0358da4647276337118a21138c47158ed495f\"", "is_server_owner": false,
+        "password": "$6$rounds=651014$1WS6cx7zlRMiCSiK$tkm9mUVJZTVx.n2ZS2.L1WcecGUwvFSnfV7US520UyUHlTiD0av/LGsnf.o/EIK4x2pxfxt8bDK2JtwCisve//",
         "self_link": "http://localhost:9001/3.0/users/11", "user_id": 11}'}
     headers:
       content-length: ['326']
@@ -55,36 +55,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/fritz@example.org
-  response:
-    body: {string: !!python/unicode '{"email": "fritz@example.org", "http_etag": "\"31b39d92c4c510d701a9be2bb097ee4dcbfb4ed9\"",
-        "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", "user":
-        "http://localhost:9001/3.0/users/11", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['324']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"c0069cae5d04efb49c7546aef78ce21c4d054047\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/11"}'}
-    headers:
-      content-length: ['283']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
@@ -156,8 +126,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"774baf718c3ef57a6de74f3fb5dabb64adf448e0\"", "is_server_owner": false,
-        "password": "$6$rounds=684393$gr7xhY64Qq34oaid$CbGxn/bFvV5YVDnR8gCPaoi3PkXr/IwvUGaYfeghdYbezpiz6Iy3Hen78NXyCSYWmjrYeq4B7b28fic.bhWVK.",
+        "\"7db0358da4647276337118a21138c47158ed495f\"", "is_server_owner": false,
+        "password": "$6$rounds=651014$1WS6cx7zlRMiCSiK$tkm9mUVJZTVx.n2ZS2.L1WcecGUwvFSnfV7US520UyUHlTiD0av/LGsnf.o/EIK4x2pxfxt8bDK2JtwCisve//",
         "self_link": "http://localhost:9001/3.0/users/11", "user_id": 11}'}
     headers:
       content-length: ['326']
@@ -188,36 +158,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/fritz@example.org
-  response:
-    body: {string: !!python/unicode '{"email": "fritz@example.org", "http_etag": "\"31b39d92c4c510d701a9be2bb097ee4dcbfb4ed9\"",
-        "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", "user":
-        "http://localhost:9001/3.0/users/11", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['324']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"c0069cae5d04efb49c7546aef78ce21c4d054047\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/11"}'}
-    headers:
-      content-length: ['283']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary.yaml
index ae16f68..a703e9e 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary.yaml
@@ -600,10 +600,10 @@
     uri: http://localhost:9001/3.0/users
   response:
     body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23",
-        "http_etag": "\"a119139658280a28616ab32845860716e30d54aa\"", "is_server_owner":
-        false, "password": "$6$rounds=668672$UGbKIk63ZWyvOrKr$CjQekHj8c3HSMTEspzYPunBRAQckEqXXKy8HcX37jRNY/ikeXFv9im6e1p2AkrDu.ybkcdkwz7I5IH1C5SkwI0",
+        "http_etag": "\"a531627473d3c42f839df72e1179d6fb7416c340\"", "is_server_owner":
+        false, "password": "$6$rounds=716038$rjFuMqcGBhC9Af.V$E.MKJZz6EAd5gZeB.0HNDItwVINNxQD4ZU/r8QLLhuyL6G.KEaYxFF7QrtNPKQDfvBg8GMD/THlLhDekZFegn/",
         "self_link": "http://localhost:9001/3.0/users/15", "user_id": 15}], "http_etag":
-        "\"44166c391db1c47d12cb4559bd1121973bf799a6\"", "start": 0, "total_size":
+        "\"c86f65db990cbb218aa9d5dd07f5e2a5b364ca26\"", "start": 0, "total_size":
         1}'}
     headers:
       content-length: ['431']
@@ -712,10 +712,10 @@
     uri: http://localhost:9001/3.0/users
   response:
     body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23",
-        "http_etag": "\"bcc61a62a5957478a1e99c3d6ba1d5cfe9fa9090\"", "is_server_owner":
-        false, "password": "$6$rounds=660245$MhzmhqvIGX3afEYw$Rr5ZnbO9U6HSoDJDUTbCh1fIeLMLtU3LFhzvgN8tl6lqemyR74KUcvJoMN4Rh6DOws/LuAOL.rQJAGElgGIM41",
+        "http_etag": "\"a7c0d6889f70b59a124905d4c7c7111b11551ca3\"", "is_server_owner":
+        false, "password": "$6$rounds=702281$U/3ZLVUTudSZLlZH$LrA9kL0T57Lr8GSs6RS4ZAE5vgr8upiAqhnVz.lXvZbn8tMbUz/VpyG9xfSkLvv3BqIzlZIu6mpaczTPlmeRc/",
         "self_link": "http://localhost:9001/3.0/users/16", "user_id": 16}], "http_etag":
-        "\"2f363f5c65f555858d199376fe9b8e235f461a49\"", "start": 0, "total_size":
+        "\"da82cd93a4a5c06a93ea27699ef44fe13900fdb4\"", "start": 0, "total_size":
         1}'}
     headers:
       content-length: ['431']
@@ -1160,10 +1160,10 @@
     uri: http://localhost:9001/3.0/users
   response:
     body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23",
-        "http_etag": "\"67b2679aa741d7802af424685f1f52e58220fe1e\"", "is_server_owner":
-        false, "password": "$6$rounds=611082$NUCl9kFdxH2h1Fim$68NxHafy2br5xmV30QGElhVFZ2r/KIQXWAiGv.YyGwvwzXt35TUnYUOhug50OHdTcJk.88gMaqli.z.qrbZof/",
+        "http_etag": "\"fe30bde1bb1f2782618c013e4d84fd01f2be77ed\"", "is_server_owner":
+        false, "password": "$6$rounds=599671$reIkEyBqsvnMS5ns$npdWKphARj.nzK7kulwvYoJ5JGnR7FNPVoDET14UCNeuU7SEzGwOerbz4/4vFl5UazVF/0uQhwdJB//R0sBMh1",
         "self_link": "http://localhost:9001/3.0/users/17", "user_id": 17}], "http_etag":
-        "\"018513ec86ebf31ac885e174dd40268a2e0048f9\"", "start": 0, "total_size":
+        "\"fd68f4a41dbd2c54b54ae737bef732d47cc7ee79\"", "start": 0, "total_size":
         1}'}
     headers:
       content-length: ['431']
@@ -1272,10 +1272,10 @@
     uri: http://localhost:9001/3.0/users
   response:
     body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23",
-        "http_etag": "\"c5a32a8d4de390f96b760b8936ca26554c4cd555\"", "is_server_owner":
-        false, "password": "$6$rounds=611392$VWmg3MZFQbBP/63H$J5DWZ50qiU8HM7YIQd9uHuLOXnzh7Dd1y4AtwLqQjgAYrUlahgoJPD1aeu9bsLd3NntkhfjZXtzubSLqVdEaE0",
+        "http_etag": "\"4069f0666f269c69537d6ad2ece8e3eaec6882b3\"", "is_server_owner":
+        false, "password": "$6$rounds=671105$BC4rSNHWy/JkJfj8$HcwNXekuZ462tp5hnP3hVVtNVvyzn8JCcTynIJjDHIqV.62XlQlhMRPh7J/3AOOevu8PME9oJmRM1i/.XYa8x0",
         "self_link": "http://localhost:9001/3.0/users/18", "user_id": 18}], "http_etag":
-        "\"e7b5c06e29019808d84b4652b81df6f678949b67\"", "start": 0, "total_size":
+        "\"e6885c4aa47cf60a17d00320b22db0b52dad2cfc\"", "start": 0, "total_size":
         1}'}
     headers:
       content-length: ['431']
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_moderator.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_moderator.yaml
index 4ba2e79..f023ff2 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_moderator.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_moderator.yaml
@@ -15,7 +15,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=test%40example.com&role=moderator
+    body: list_id=foo.example.com&role=moderator&subscriber=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -77,21 +77,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"6c39fd341eea07279f00e7cd3cd0ecd501bc0cec\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/14"}'}
-    headers:
-      content-length: ['283']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_owner.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_owner.yaml
index ecac3ce..ac8fee1 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_owner.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_owner.yaml
@@ -15,7 +15,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=test%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -77,21 +77,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"183bd2070dec2c1087e072dede15f46d64ad4c23\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/13"}'}
-    headers:
-      content-length: ['283']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/test@example.com",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_moderator.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_moderator.yaml
index 61005d2..92491d6 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_moderator.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_moderator.yaml
@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: password=None&display_name=&email=test%40example.com
+    body: email=test%40example.com&password=None
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -28,7 +28,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=test%40example.com&role=moderator
+    body: list_id=foo.example.com&role=moderator&subscriber=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -63,8 +63,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"67b2679aa741d7802af424685f1f52e58220fe1e\"", "is_server_owner": false,
-        "password": "$6$rounds=611082$NUCl9kFdxH2h1Fim$68NxHafy2br5xmV30QGElhVFZ2r/KIQXWAiGv.YyGwvwzXt35TUnYUOhug50OHdTcJk.88gMaqli.z.qrbZof/",
+        "\"fe30bde1bb1f2782618c013e4d84fd01f2be77ed\"", "is_server_owner": false,
+        "password": "$6$rounds=599671$reIkEyBqsvnMS5ns$npdWKphARj.nzK7kulwvYoJ5JGnR7FNPVoDET14UCNeuU7SEzGwOerbz4/4vFl5UazVF/0uQhwdJB//R0sBMh1",
         "self_link": "http://localhost:9001/3.0/users/17", "user_id": 17}'}
     headers:
       content-length: ['326']
@@ -91,21 +91,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"728b0a651f28a9aef0690432eb539012aa4c130d\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/17"}'}
-    headers:
-      content-length: ['283']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_owner.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_owner.yaml
index d9ed7f7..398333a 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_owner.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_owner.yaml
@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: password=None&display_name=&email=test%40example.com
+    body: email=test%40example.com&password=None
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -28,7 +28,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=test%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -63,8 +63,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"c5a32a8d4de390f96b760b8936ca26554c4cd555\"", "is_server_owner": false,
-        "password": "$6$rounds=611392$VWmg3MZFQbBP/63H$J5DWZ50qiU8HM7YIQd9uHuLOXnzh7Dd1y4AtwLqQjgAYrUlahgoJPD1aeu9bsLd3NntkhfjZXtzubSLqVdEaE0",
+        "\"4069f0666f269c69537d6ad2ece8e3eaec6882b3\"", "is_server_owner": false,
+        "password": "$6$rounds=671105$BC4rSNHWy/JkJfj8$HcwNXekuZ462tp5hnP3hVVtNVvyzn8JCcTynIJjDHIqV.62XlQlhMRPh7J/3AOOevu8PME9oJmRM1i/.XYa8x0",
         "self_link": "http://localhost:9001/3.0/users/18", "user_id": 18}'}
     headers:
       content-length: ['326']
@@ -91,21 +91,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"c15852aab181b68acbd442056b76d5dd8a6daa16\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/18"}'}
-    headers:
-      content-length: ['283']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/test@example.com",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_moderator.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_moderator.yaml
index aecd6ba..654cc4b 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_moderator.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_moderator.yaml
@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: password=None&display_name=&email=test%40example.com
+    body: email=test%40example.com&password=None
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -52,7 +52,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=anotheremail%40example.com&role=moderator
+    body: list_id=foo.example.com&role=moderator&subscriber=anotheremail%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -87,8 +87,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"a119139658280a28616ab32845860716e30d54aa\"", "is_server_owner": false,
-        "password": "$6$rounds=668672$UGbKIk63ZWyvOrKr$CjQekHj8c3HSMTEspzYPunBRAQckEqXXKy8HcX37jRNY/ikeXFv9im6e1p2AkrDu.ybkcdkwz7I5IH1C5SkwI0",
+        "\"a531627473d3c42f839df72e1179d6fb7416c340\"", "is_server_owner": false,
+        "password": "$6$rounds=716038$rjFuMqcGBhC9Af.V$E.MKJZz6EAd5gZeB.0HNDItwVINNxQD4ZU/r8QLLhuyL6G.KEaYxFF7QrtNPKQDfvBg8GMD/THlLhDekZFegn/",
         "self_link": "http://localhost:9001/3.0/users/15", "user_id": 15}'}
     headers:
       content-length: ['326']
@@ -119,36 +119,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/anotheremail@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "anotheremail@example.com", "http_etag":
-        "\"d652d3593551672385cb4c02a31cf9401c4134e7\"", "original_email": "anotheremail@example.com",
-        "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/anotheremail@example.com",
-        "user": "http://localhost:9001/3.0/users/15", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['345']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"7e89118330bb8d4cfca6242e4023e3685cfe802f\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/15"}'}
-    headers:
-      content-length: ['283']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_owner.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_owner.yaml
index e96f57b..dfe6ab4 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_owner.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_owner.yaml
@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: password=None&display_name=&email=test%40example.com
+    body: email=test%40example.com&password=None
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -52,7 +52,7 @@
       content-type: [application/json; charset=utf-8]
     status: {code: 200, message: OK}
 - request:
-    body: list_id=foo.example.com&subscriber=anotheremail%40example.com&role=owner
+    body: list_id=foo.example.com&role=owner&subscriber=anotheremail%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -87,8 +87,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"bcc61a62a5957478a1e99c3d6ba1d5cfe9fa9090\"", "is_server_owner": false,
-        "password": "$6$rounds=660245$MhzmhqvIGX3afEYw$Rr5ZnbO9U6HSoDJDUTbCh1fIeLMLtU3LFhzvgN8tl6lqemyR74KUcvJoMN4Rh6DOws/LuAOL.rQJAGElgGIM41",
+        "\"a7c0d6889f70b59a124905d4c7c7111b11551ca3\"", "is_server_owner": false,
+        "password": "$6$rounds=702281$U/3ZLVUTudSZLlZH$LrA9kL0T57Lr8GSs6RS4ZAE5vgr8upiAqhnVz.lXvZbn8tMbUz/VpyG9xfSkLvv3BqIzlZIu6mpaczTPlmeRc/",
         "self_link": "http://localhost:9001/3.0/users/16", "user_id": 16}'}
     headers:
       content-length: ['326']
@@ -119,36 +119,6 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/anotheremail@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "anotheremail@example.com", "http_etag":
-        "\"a6242100b2e468ea0c2932b09c86970b7f41152f\"", "original_email": "anotheremail@example.com",
-        "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/anotheremail@example.com",
-        "user": "http://localhost:9001/3.0/users/16", "verified_on": "2005-08-01T07:49:23"}'}
-    headers:
-      content-length: ['345']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
-    uri: http://localhost:9001/3.0/addresses/test@example.com
-  response:
-    body: {string: !!python/unicode '{"email": "test@example.com", "http_etag": "\"4f8c6ce236ae784932ac2c3760ac04a842169db0\"",
-        "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23",
-        "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user":
-        "http://localhost:9001/3.0/users/16"}'}
-    headers:
-      content-length: ['283']
-      content-type: [application/json; charset=utf-8]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      accept-encoding: ['gzip, deflate']
-    method: !!python/unicode 'GET'
     uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner
   response:
     body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/anotheremail@example.com",
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_model.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_model.yaml
index 01e36cf..c200fdd 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_model.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_model.yaml
@@ -56,7 +56,7 @@
       location: ['http://localhost:9001/3.0/lists/foo.example.com']
     status: {code: 201, message: Created}
 - request:
-    body: password=&display_name=&email=test%40example.com
+    body: email=test%40example.com
     headers:
       accept-encoding: ['gzip, deflate']
       !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded']
@@ -76,8 +76,8 @@
     uri: http://localhost:9001/3.0/users/test@example.com
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"a742c95930ea89b02cfce2eb4a736f2cb07e09d1\"", "is_server_owner": false,
-        "password": "$6$rounds=697251$nucmRyLySnb09DHg$LRicvfx2HVdYahLD828q.g/OxkHjcReSyU632nP9RFj/TITteP2x813zBQyZuyajpD1yGv9hnFyx910zXTOKI/",
+        "\"bd4de82adb461f6b4ea8a7115ed24877bc3a2fcc\"", "is_server_owner": false,
+        "password": "$6$rounds=658979$XyQacoPmcY8pvmBB$4m.yKSbMA76bwDrA8TeRDjoGMNJ0jATrpH1DuZvSH5jf7xpZCeOivQZMiTHqJpl8VeVVi092ajrqKzwwDZ7kT1",
         "self_link": "http://localhost:9001/3.0/users/20", "user_id": 20}'}
     headers:
       content-length: ['326']
@@ -135,10 +135,10 @@
     uri: http://localhost:9001/3.0/users
   response:
     body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23",
-        "http_etag": "\"a742c95930ea89b02cfce2eb4a736f2cb07e09d1\"", "is_server_owner":
-        false, "password": "$6$rounds=697251$nucmRyLySnb09DHg$LRicvfx2HVdYahLD828q.g/OxkHjcReSyU632nP9RFj/TITteP2x813zBQyZuyajpD1yGv9hnFyx910zXTOKI/",
+        "http_etag": "\"bd4de82adb461f6b4ea8a7115ed24877bc3a2fcc\"", "is_server_owner":
+        false, "password": "$6$rounds=658979$XyQacoPmcY8pvmBB$4m.yKSbMA76bwDrA8TeRDjoGMNJ0jATrpH1DuZvSH5jf7xpZCeOivQZMiTHqJpl8VeVVi092ajrqKzwwDZ7kT1",
         "self_link": "http://localhost:9001/3.0/users/20", "user_id": 20}], "http_etag":
-        "\"21da88a3faf90d878876057239b7aec12a80dbff\"", "start": 0, "total_size":
+        "\"eb5d2f35eab291e2fb095b42534a1c97e541cd45\"", "start": 0, "total_size":
         1}'}
     headers:
       content-length: ['431']