diff --git a/addons/payment/models/payment_token.py b/addons/payment/models/payment_token.py
index 57ae04c09f8..792046c3ae0 100644
--- a/addons/payment/models/payment_token.py
+++ b/addons/payment/models/payment_token.py
@@ -11,8 +11,7 @@ class PaymentToken(models.Model):
     _order = 'partner_id, id desc'
     _description = 'Payment Token'
 
-    provider_id = fields.Many2one(
-        string="provider Account", comodel_name='payment.provider', required=True)
+    provider_id = fields.Many2one(string="Provider", comodel_name='payment.provider', required=True)
     provider_code = fields.Selection(related='provider_id.code')
     payment_details = fields.Char(
         string="Payment Details", help="The clear part of the payment method's payment details.",
@@ -113,7 +112,7 @@ class PaymentToken(models.Model):
         """
         self.ensure_one()
 
-        padding_length = max_length - len(self.payment_details)
+        padding_length = max_length - len(self.payment_details or '')
         if not self.payment_details:
             create_date_str = self.create_date.strftime('%Y/%m/%d')
             display_name = _("Payment details saved on %(date)s", date=create_date_str)
diff --git a/addons/payment/views/payment_token_views.xml b/addons/payment/views/payment_token_views.xml
index ef8793a1e8b..cef15ecc528 100644
--- a/addons/payment/views/payment_token_views.xml
+++ b/addons/payment/views/payment_token_views.xml
@@ -15,14 +15,16 @@
                         </button>
                     </div>
                     <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
-                    <group name="general_information">
-                        <field name="payment_details"/>
-                        <field name="partner_id" />
-                    </group>
-                    <group name="technical_information">
-                        <field name="provider_id"/>
-                        <field name="provider_ref"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
+                    <group>
+                        <group name="general_information">
+                            <field name="payment_details"/>
+                            <field name="partner_id" />
+                        </group>
+                        <group name="technical_information">
+                            <field name="provider_id"/>
+                            <field name="provider_ref"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
                     </group>
                 </sheet>
             </form>