diff --git a/src/pretix/base/services/invoices.py b/src/pretix/base/services/invoices.py
index 07b0d89c6..877bf1f78 100644
--- a/src/pretix/base/services/invoices.py
+++ b/src/pretix/base/services/invoices.py
@@ -39,7 +39,10 @@ def build_invoice(invoice: Invoice) -> Invoice:
         introductory = invoice.event.settings.get('invoice_introductory_text', as_type=LazyI18nString)
         additional = invoice.event.settings.get('invoice_additional_text', as_type=LazyI18nString)
         footer = invoice.event.settings.get('invoice_footer_text', as_type=LazyI18nString)
-        payment = payment_provider.render_invoice_text(invoice.order)
+        if payment_provider:
+            payment = payment_provider.render_invoice_text(invoice.order)
+        else:
+            payment = ""
 
         invoice.introductory_text = str(introductory).replace('\n', '<br />')
         invoice.additional_text = str(additional).replace('\n', '<br />')
diff --git a/src/pretix/control/forms/orders.py b/src/pretix/control/forms/orders.py
index 9cb1c61e2..77d49e821 100644
--- a/src/pretix/control/forms/orders.py
+++ b/src/pretix/control/forms/orders.py
@@ -36,7 +36,9 @@ class ExtendForm(I18nModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if self.instance.status == Order.STATUS_PENDING or self.instance._is_still_available(now(), count_waitinglist=False) is True:
+        if self.instance.status == Order.STATUS_PENDING or self.instance._is_still_available(now(),
+                                                                                             count_waitinglist=False)\
+                is True:
             del self.fields['quota_ignore']
 
     def clean(self):
@@ -47,8 +49,33 @@ class ExtendForm(I18nModelForm):
         return data
 
 
-class ExporterForm(forms.Form):
+class MarkPaidForm(forms.Form):
+    force = forms.BooleanField(
+        label=_('Overbook quota and ignore late payment'),
+        help_text=_('If you check this box, this operation will be performed even if it leads to an overbooked quota '
+                    'and you having sold more tickets than you planned! The operation will also be performed '
+                    'regardless of the settings for late payments.'),
+        required=False
+    )
 
+    def __init__(self, *args, **kwargs):
+        self.instance = kwargs.pop("instance")
+        super().__init__(*args, **kwargs)
+        quota_fail = (
+            self.instance.status == Order.STATUS_PENDING or
+            self.instance._is_still_available(now(), count_waitinglist=False) is True
+        )
+        term_last = self.instance.payment_term_last
+        term_fail = (
+            (not term_last or term_last >= now()) and
+            (self.instance.status == Order.STATUS_PENDING or self.instance.event.settings.get(
+                'payment_term_accept_late'))
+        )
+        if quota_fail or term_fail:
+            del self.fields['force']
+
+
+class ExporterForm(forms.Form):
     def clean(self):
         data = super().clean()
 
diff --git a/src/pretix/control/templates/pretixcontrol/order/index.html b/src/pretix/control/templates/pretixcontrol/order/index.html
index 04e45a3f2..174e5d1e9 100644
--- a/src/pretix/control/templates/pretixcontrol/order/index.html
+++ b/src/pretix/control/templates/pretixcontrol/order/index.html
@@ -25,7 +25,9 @@
             <div class="btn-toolbar" role="toolbar">
                 <div class="btn-group" role="group">
                     {% if order.status == 'n' or order.status == 'e' %}
-                        <button name="status" value="p" class="btn btn-default">{% trans "Mark as paid" %}</button>
+                        <a href="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}?status=p" class="btn btn-default">
+                            {% trans "Mark as paid" %}
+                        </a>
                         <a href="{% url "control:event.order.extend" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}" class="btn btn-default">
                             {% trans "Extend payment term" %}
                         </a>
diff --git a/src/pretix/control/templates/pretixcontrol/order/pay.html b/src/pretix/control/templates/pretixcontrol/order/pay.html
new file mode 100644
index 000000000..b22424c63
--- /dev/null
+++ b/src/pretix/control/templates/pretixcontrol/order/pay.html
@@ -0,0 +1,36 @@
+{% extends "pretixcontrol/event/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block title %}
+    {% trans "Mark order as paid" %}
+{% endblock %}
+{% block content %}
+    <h1>
+        {% trans "Mark order as paid" %}
+        <a class="btn btn-link btn-lg"
+                href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
+            {% blocktrans trimmed with order=order.code %}
+                Back to order {{ order }}
+            {% endblocktrans %}
+        </a>
+    </h1>
+
+    <form method="post" class="form-horizontal" href="">
+        {% csrf_token %}
+        <p>{% blocktrans trimmed %}
+            Do you really want to mark this order as paid?
+        {% endblocktrans %}</p>
+        <input type="hidden" name="status" value="p" />
+        {% bootstrap_form form layout='horizontal' horizontal_label_class='sr-only' horizontal_field_class='col-md-12' %}
+        <div class="form-group submit-group">
+            <a class="btn btn-default btn-lg"
+                    href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
+                {% trans "Cancel" %}
+            </a>
+            <button class="btn btn-primary btn-save btn-lg" type="submit">
+                {% trans "Mark as paid" %}
+            </button>
+            <div class="clearfix"></div>
+        </div>
+    </form>
+{% endblock %}
diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py
index 91607ecad..38389730e 100644
--- a/src/pretix/control/views/orders.py
+++ b/src/pretix/control/views/orders.py
@@ -47,9 +47,9 @@ from pretix.base.views.async import AsyncAction
 from pretix.base.views.mixins import OrderQuestionsViewMixin
 from pretix.control.forms.filter import EventOrderFilterForm
 from pretix.control.forms.orders import (
-    CommentForm, ExporterForm, ExtendForm, OrderContactForm, OrderLocaleForm,
-    OrderMailForm, OrderPositionAddForm, OrderPositionChangeForm,
-    OtherOperationsForm,
+    CommentForm, ExporterForm, ExtendForm, MarkPaidForm, OrderContactForm,
+    OrderLocaleForm, OrderMailForm, OrderPositionAddForm,
+    OrderPositionChangeForm, OtherOperationsForm,
 )
 from pretix.control.permissions import EventPermissionRequiredMixin
 from pretix.control.views import PaginationMixin
@@ -225,12 +225,24 @@ class OrderComment(OrderView):
 class OrderTransition(OrderView):
     permission = 'can_change_orders'
 
+    @cached_property
+    def mark_paid_form(self):
+        return MarkPaidForm(
+            instance=self.order,
+            data=self.request.POST if self.request.method == "POST" else None,
+        )
+
     def post(self, *args, **kwargs):
         to = self.request.POST.get('status', '')
         if self.order.status in (Order.STATUS_PENDING, Order.STATUS_EXPIRED) and to == 'p':
+            if not self.mark_paid_form.is_valid():
+                return render(self.request, 'pretixcontrol/order/pay.html', {
+                    'form': self.mark_paid_form,
+                    'order': self.order,
+                })
             try:
                 mark_order_paid(self.order, manual=True, user=self.request.user,
-                                count_waitinglist=False)
+                                count_waitinglist=False, force=self.mark_paid_form.cleaned_data.get('force', False))
             except Quota.QuotaExceededException as e:
                 messages.error(self.request, str(e))
             except SendMailException:
@@ -260,7 +272,12 @@ class OrderTransition(OrderView):
 
     def get(self, *args, **kwargs):
         to = self.request.GET.get('status', '')
-        if self.order.cancel_allowed() and to == 'c':
+        if self.order.status in (Order.STATUS_PENDING, Order.STATUS_EXPIRED) and to == 'p':
+            return render(self.request, 'pretixcontrol/order/pay.html', {
+                'form': self.mark_paid_form,
+                'order': self.order,
+            })
+        elif self.order.cancel_allowed() and to == 'c':
             return render(self.request, 'pretixcontrol/order/cancel.html', {
                 'order': self.order,
             })