diff --git a/scipost/views.py b/scipost/views.py
index b76db1af674fa335c47b01234e7e65df665aa244..a263c0c812483c332380b96e2f00d5d73f05b2f2 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -271,9 +271,12 @@ def vet_registration_request_ack(request, contributor_id):
 
             # Verify if there is a pending refereeing invitation using email and invitation key.
             updated_rows = RefereeInvitation.objects.open().filter(
+                referee__isnull=True,
                 email_address=contributor.user.email).update(referee=contributor)
-            updated_rows += RefereeInvitation.objects.open().filter(
-                invitation_key=contributor.invitation_key).update(referee=contributor)
+            if contributor.invitation_key:
+                updated_rows += RefereeInvitation.objects.open().filter(
+                    referee__isnull=True,
+                    invitation_key=contributor.invitation_key).update(referee=contributor)
             pending_ref_inv_exists = updated_rows > 0
 
             email_text = (
diff --git a/submissions/templates/submissions/admin/editorial_assignment_form.html b/submissions/templates/submissions/admin/editorial_assignment_form.html
index a437401f49b0a43daad1775e9280f065fb82cef9..7a52684c68c513188253543bedcdc49b7c9c4068 100644
--- a/submissions/templates/submissions/admin/editorial_assignment_form.html
+++ b/submissions/templates/submissions/admin/editorial_assignment_form.html
@@ -65,6 +65,8 @@
 
 <div class="row">
     <div class="col-12">
+        <a href="?flag=1">Refresh all conflicts</a>
+        <br>
         {% if coauthorships %}
             <div class="card border-danger">
                 <div class="card-body">
diff --git a/submissions/utils.py b/submissions/utils.py
index 03da8f41840a432a494b18c32fc7fd5297ebae3b..c2842e88f4c6fc740690d71d0f9d315cd93a8b65 100644
--- a/submissions/utils.py
+++ b/submissions/utils.py
@@ -49,11 +49,11 @@ class BaseSubmissionCycle:
             # Editor-in-charge has requested revision.
             return False
 
-        if not self.submission.plagiarism_report:
-            # No plagiarism report is known yet.
-            self.required_actions.append((
-                'plagiarism_report',
-                'No plagiarism report found. Please run the plagiarism check.'))
+        # if not self.submission.plagiarism_report:
+        #     # No plagiarism report is known yet.
+        #     self.required_actions.append((
+        #         'plagiarism_report',
+        #         'No plagiarism report found. Please run the plagiarism check.'))
 
         if self.submission.eicrecommendations.active().exists():
             # An Editorial Recommendation has already been submitted. Cycle done.
diff --git a/submissions/views.py b/submissions/views.py
index 72b48946933cf11a1aa12fc494ef185061bddd08..0e0cfafe9648b98fa036f3befbe4adbb1d615bf6 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -490,14 +490,14 @@ def assign_submission(request, arxiv_identifier_w_vn_nr):
         messages.success(request, 'Your assignment request has been sent successfully.')
         return redirect('submissions:pool')
 
-    fellows_with_expertise = submission.fellows.all()
-    coauthorships = submission.flag_coauthorships_arxiv(fellows_with_expertise)
-
     context = {
         'submission_to_assign': submission,
-        'coauthorships': coauthorships,
         'form': form
     }
+
+    if request.GET.get('flag'):
+        fellows_with_expertise = submission.fellows.all()
+        context['coauthorships'] = submission.flag_coauthorships_arxiv(fellows_with_expertise)
     return render(request, 'submissions/admin/editorial_assignment_form.html', context)
 
 
diff --git a/templates/email/registration_invitation.html b/templates/email/registration_invitation.html
index beae41fdc428089bb93649de69e6512c273eeac2..5a2b2a96ee3fa7a467d7b1a60efa3acfac7f0870 100644
--- a/templates/email/registration_invitation.html
+++ b/templates/email/registration_invitation.html
@@ -160,7 +160,7 @@ Dear {% if invitation.message_style == 'F' %}{{ invitation.get_title_display }}
         Besides looking around the site, you can also personally register
         (to become a Contributor, without necessarily committing to membership
         of the Editorial College, this to be discussed separately) by visiting
-        the following <a href="https://scipost.org/invitation/{{ invitation.cited_in_publication.citation }}">
+        the following <a href="https://scipost.org/invitation/{{ invitation.invitation_key }}">
         single-use link</a>, containing a partly pre-filled form for your convenience.
     </p>
     <p>
@@ -198,7 +198,7 @@ Dear {% if invitation.message_style == 'F' %}{{ invitation.get_title_display }}
         <br>1098 XH Amsterdam
         <br>The Netherlands
         <br>---------------------------------------------
-        <br>tel.: +31 (0)20 5255775\nfax: +31 (0)20 5255778
+        <br>tel.: +31 (0)20 5255775
         <br>---------------------------------------------
     </p>
 {% endif %}