diff --git a/finance/signals.py b/finance/signals.py
index 54091ea..11623f9 100644
--- a/finance/signals.py
+++ b/finance/signals.py
@@ -10,8 +10,9 @@ def delete_dependencies(instance, **kwargs):
     """Отправка сообщения после сохранения платежа"""
     if instance.yandex_pay and instance.method == 'Y' and instance.status == 'P':
         body = {
-            "subject": 'Спасибо за регистрацию',
-            "message": '''Вам выставлен счёт, для оплаты перейдите по ссылке /api/v1/finance/payment/%s/''' % instance.yandex_pay.id,
+            "subject": 'Вам выставлен новый счёт',
+            "message": '''Вам выставлен счёт, для оплаты перейдите по ссылке
+            https://go.skillbox.ru/api/v1/finance/payment/%s/''' % instance.yandex_pay.id,
             "from_email": 'robo@skillbox.ru',
             "recipient_list": [instance.yandex_pay.cps_email],
         }
diff --git a/finance/views.py b/finance/views.py
index 9576179..638c0d1 100644
--- a/finance/views.py
+++ b/finance/views.py
@@ -46,16 +46,18 @@ class BillListView(APIView):
                     i['status'] = get_real_name(elem=i['status'][0], array=Invoice.BILL_STATUSES)
                     i['bill'] = bill_obj
                     i['yandex_pay'] = None
+                    invoice, _is_create = Invoice.objects.update_or_create(**i)
                     if i['method'] == 'Y' and i['status'] == 'P':
-                        i['yandex_pay'], _is_create = Payment.objects.get_or_create(
+                        yandex_pay, _is_create = Payment.objects.get_or_create(
                             order_amount=i['price'],
-                            order_number=bill_obj.id,
+                            order_number=invoice.id,
                             customer_number=bill_obj.user.id,
                             user=bill_obj.user,
                             cps_email=bill_obj.user.email,
                         )
+                    invoice.yandex_pay=yandex_pay
+                    invoice.save()
 
-                    invoice, _is_create = Invoice.objects.update_or_create(**i)
                     invoices = [j for j in invoices if not j.id == invoice.id]
 
                 [i.delete() for i in invoices]