diff --git a/sql/branch.sql b/sql/branch.sql
index 049bf90f1..033665409 100644
--- a/sql/branch.sql
+++ b/sql/branch.sql
@@ -4,7 +4,10 @@ BEGIN;
         ADD COLUMN independent boolean DEFAULT true,
         ADD COLUMN loss_taker loss_taker DEFAULT 'provider',
         ADD COLUMN details_submitted boolean,
-        ADD COLUMN allow_payout boolean;
+        ADD COLUMN allow_payout boolean,
+        DROP CONSTRAINT payment_accounts_participant_provider_country_is_current_key;
+    CREATE INDEX payment_accounts_participant_provider_country_is_current_idx
+        ON payment_accounts (participant, provider, country, is_current);
 END;
 SELECT 'after deployment';
 BEGIN;
diff --git a/www/%username/payment/stripe/create.spt b/www/%username/payment/stripe/create.spt
index 3d57c5ff9..9cb35791d 100644
--- a/www/%username/payment/stripe/create.spt
+++ b/www/%username/payment/stripe/create.spt
@@ -61,12 +61,6 @@ if request.method == 'POST':
     else:
         loss_taker = 'platform'
     serial_number = website.db.one("""
-        UPDATE payment_accounts
-           SET is_current = NULL
-         WHERE participant = %(p_id)s
-           AND provider = 'stripe'
-           AND country = %(country)s;
-
         INSERT INTO payment_accounts
                     (participant, provider, country, id,
                      default_currency, charges_enabled, verified,
diff --git a/www/payment-providers/%provider/connect.spt b/www/payment-providers/%provider/connect.spt
index a6b37555a..14a530b7c 100644
--- a/www/payment-providers/%provider/connect.spt
+++ b/www/payment-providers/%provider/connect.spt
@@ -185,12 +185,6 @@ elif 'state' in request.qs:
     account_data['token'] = json.dumps(account_data['token'])
     with website.db.get_cursor() as cursor:
         cursor.run("""
-            UPDATE payment_accounts
-               SET is_current = NULL
-             WHERE participant = %(p_id)s
-               AND provider = %(provider)s
-               AND country = %(country)s;
-
             INSERT INTO payment_accounts
                         (participant, provider, country, id,
                          default_currency, charges_enabled, verified,
diff --git a/www/payment-providers/paypal/add.spt b/www/payment-providers/paypal/add.spt
index e830dd732..6745f1be3 100644
--- a/www/payment-providers/paypal/add.spt
+++ b/www/payment-providers/paypal/add.spt
@@ -25,12 +25,6 @@ if request.method == 'POST':
     )
     with website.db.get_cursor() as cursor:
         cursor.run("""
-            UPDATE payment_accounts
-               SET is_current = NULL
-             WHERE participant = %(p_id)s
-               AND provider = 'paypal'
-               AND country = %(country)s;
-
             INSERT INTO payment_accounts
                         (participant, provider, country, id, verified,
                          independent, loss_taker)