diff --git a/scipost/forms.py b/scipost/forms.py
index 047e3a0041438b5d14fedec3d4c01b5c13f1990b..8a3d13a5d8244b83e6b46dbcd20a73d5522b31ea 100644
--- a/scipost/forms.py
+++ b/scipost/forms.py
@@ -143,6 +143,9 @@ class DraftInvitationForm(forms.ModelForm):
 
     def clean_email(self):
         email = self.cleaned_data['email']
+        if self.instance.id:
+            return email
+
         if RegistrationInvitation.objects.filter(email=email).exists():
             self.add_error('email', 'This email address has already been used for an invitation')
 
diff --git a/scipost/templates/scipost/edit_draft_reg_inv.html b/scipost/templates/scipost/edit_draft_reg_inv.html
index 14a601fcce56ce0a207a5f8fa1d1e500ac24a2b1..f6fd6afe34f7e90492f7e502306e8cc1e280bc1f 100644
--- a/scipost/templates/scipost/edit_draft_reg_inv.html
+++ b/scipost/templates/scipost/edit_draft_reg_inv.html
@@ -36,10 +36,7 @@ $(document).ready(function(){
 <div class="row">
     <div class="col-12">
         <h1 class="highlight">Edit a draft registration invitation</h1>
-        {% if errormessage %}
-            <h3 class="text-danger">{{ errormessage }}</h3>
-        {% endif %}
-        <form action="{% url 'scipost:edit_draft_reg_inv' draft_id=draft.id %}" method="post">
+        <form action="{% url 'scipost:edit_draft_reg_inv' draft_id=draft_inv_form.instance.id %}" method="post">
             {% csrf_token %}
             {{draft_inv_form.media}}
             {{draft_inv_form|bootstrap}}
diff --git a/scipost/views.py b/scipost/views.py
index 724f6c3274d25f1b5cef73927f2a0265054b6d4d..e605ca824a9d5678df4d5dc020e28fc7e89c2bf7 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -443,23 +443,15 @@ def draft_registration_invitation(request):
 @permission_required('scipost.can_manage_registration_invitations', return_403=True)
 def edit_draft_reg_inv(request, draft_id):
     draft = get_object_or_404(DraftInvitation, id=draft_id)
-    errormessage = ''
-    if request.method == 'POST':
-        draft_inv_form = DraftInvitationForm(request.POST)
-        if draft_inv_form.is_valid():
-            draft.title = draft_inv_form.cleaned_data['title']
-            draft.first_name = draft_inv_form.cleaned_data['first_name']
-            draft.last_name = draft_inv_form.cleaned_data['last_name']
-            draft.email = draft_inv_form.cleaned_data['email']
-            draft.save()
-            return redirect(reverse('scipost:registration_invitations'))
-        else:
-            errormessage = 'The form is invalidly filled'
-    else:
-        draft_inv_form = DraftInvitationForm(instance=draft)
-    context = {'draft_inv_form': draft_inv_form,
-               'draft': draft,
-               'errormessage': errormessage, }
+
+    draft_inv_form = DraftInvitationForm(request.POST or None, current_user=request.user,
+                                         instance=draft)
+    if draft_inv_form.is_valid():
+        draft = draft_inv_form.save()
+        messages.success(request, 'Draft invitation saved.')
+        return redirect(reverse('scipost:registration_invitations'))
+
+    context = {'draft_inv_form': draft_inv_form}
     return render(request, 'scipost/edit_draft_reg_inv.html', context)