diff --git a/addons/payment/controllers/portal.py b/addons/payment/controllers/portal.py
index be70f46309e..6f13400356b 100644
--- a/addons/payment/controllers/portal.py
+++ b/addons/payment/controllers/portal.py
@@ -89,7 +89,7 @@ class WebsitePayment(http.Controller):
                 'amount': float(amount),
                 'currency_id': currency_id,
                 'partner_id': partner_id,
-                'type': 'form_save' if acquirer.save_token else 'form',
+                'type': 'form_save' if acquirer.save_token != 'none' and partner_id else 'form',
             }
 
             tx = request.env['payment.transaction'].sudo().create(values)
@@ -119,7 +119,7 @@ class WebsitePayment(http.Controller):
             'currency_id': int(currency_id),
             'partner_id': partner_id,
             'payment_token_id': pm_id,
-            'type': 'form_save' if token.acquirer_id.save_token else 'form',
+            'type': 'form_save' if token.acquirer_id.save_token != 'none' and partner_id else 'form',
         }
 
         tx = request.env['payment.transaction'].sudo().create(values)