diff --git a/manage_subscriptions/views.py b/manage_subscriptions/views.py
index 5575340..7c59d0e 100644
--- a/manage_subscriptions/views.py
+++ b/manage_subscriptions/views.py
@@ -781,6 +781,12 @@ def create_checkout_session(request):
                 }
             ]
             session_data["mode"] = "payment"
+        session_data["invoice_creation"] = {
+            "enabled": True,
+            "invoice_data": {
+                "metadata": session_data["metadata"],
+            }
+        }
         checkout_session = stripe.checkout.Session.create(**session_data)
         return JsonResponse({"sessionId": checkout_session["id"]})
     except Exception as e:
diff --git a/templates/manage_subscriptions/principal_subscriptions_list.html b/templates/manage_subscriptions/principal_subscriptions_list.html
index 79e88c4..97583ef 100644
--- a/templates/manage_subscriptions/principal_subscriptions_list.html
+++ b/templates/manage_subscriptions/principal_subscriptions_list.html
@@ -89,7 +89,7 @@
                                                         <td>{{data_obj.start_date}}</td>
                                                         <td>{{data_obj.end_date}}</td>
                                                         <td class="text-center">
-                                                            <span class="shadow-none badge {% if data_obj.active %}badge-primary{% else %}badge-danger{% endif %}">{{data_obj.is_stripe_subscription}}</span>
+                                                            <span class="shadow-none badge {% if data_obj.is_stripe_subscription %}badge-primary{% else %}badge-danger{% endif %}">{{data_obj.is_stripe_subscription}}</span>
                                                         </td>
                                                         <td>{{data_obj.grace_period_end_date}}</td>
                                                         <td>{{data_obj.created_on}}</td>