diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 1694d57f..95dbd208 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -1139,7 +1139,7 @@ $(document).ready(function() {
function hardReset(give_tri_focus=true) {
coolReset(give_tri_focus);
- resetCheckout();
+ checkoutInput.trigger('change');
resetArticles();
khistory.reset();
resetSettings();
diff --git a/kfet/views.py b/kfet/views.py
index 736dbe8a..787ff102 100644
--- a/kfet/views.py
+++ b/kfet/views.py
@@ -796,7 +796,15 @@ def kpsul(request):
data = {}
data['operationgroup_form'] = KPsulOperationGroupForm()
data['trigramme_form'] = KPsulAccountForm()
- data['checkout_form'] = KPsulCheckoutForm()
+ initial = {}
+ try:
+ checkout = Checkout.objects.filter(
+ is_protected=False, valid_from__lte=timezone.now(),
+ valid_to__gte=timezone.now()).get()
+ initial['checkout'] = checkout
+ except Checkout.DoesNotExist, Checkout.MultipleObjectsReturned:
+ pass
+ data['checkout_form'] = KPsulCheckoutForm(initial=initial)
operation_formset = KPsulOperationFormSet(queryset=Operation.objects.none())
data['operation_formset'] = operation_formset
return render(request, 'kfet/kpsul.html', data)