diff --git a/submissions/admin.py b/submissions/admin.py
index 78df5387cad6306dcc075d99576e120b1f57b910..d41460b4eabb23170af755deec166f5c64f55389 100644
--- a/submissions/admin.py
+++ b/submissions/admin.py
@@ -31,6 +31,8 @@ class SubmissionAdminForm(forms.ModelForm):
     authors_false_claims = forms.ModelMultipleChoiceField(
         required=False,
         queryset=Contributor.objects.order_by('user__last_name'))
+    is_resubmission_of = forms.ModelChoiceField(
+        queryset=Submission.objects.order_by('-preprint__identifier_w_vn_nr'))
 
     class Meta:
         model = Submission
diff --git a/submissions/migrations/0046_auto_20181130_1013.py b/submissions/migrations/0046_auto_20181130_1013.py
index 41769a5dbba9f9eb31028ebaa50a8379bfe39623..f865766022750d3a8e850b6da93a1b2882e5e124 100644
--- a/submissions/migrations/0046_auto_20181130_1013.py
+++ b/submissions/migrations/0046_auto_20181130_1013.py
@@ -10,7 +10,8 @@ def populate_explicit_resubmission_links(apps, schema_editor):
 
     for resubmission in Submission.objects.filter(preprint__vn_nr__gt=1):
         resub_of = Submission.objects.filter(
-            preprint__identifier_wo_vn_nr=resubmission.preprint.identifier_wo_vn_nr).order_by(
+            preprint__identifier_wo_vn_nr=resubmission.preprint.identifier_wo_vn_nr,
+            preprint__vn_nr__lt=resubmission.preprint.vn_nr).order_by(
             '-preprint__vn_nr').exclude(id=resubmission.id).first()
         Submission.objects.filter(id=resubmission.id).update(is_resubmission_of=resub_of)
 
diff --git a/submissions/migrations/0049_auto_20181204_2040.py b/submissions/migrations/0049_auto_20181204_2040.py
index bbcd903d8ecd1538e68965795fcfce6a74be4305..de5091d216afdce2fb398d7c36e78ac64ded3b89 100644
--- a/submissions/migrations/0049_auto_20181204_2040.py
+++ b/submissions/migrations/0049_auto_20181204_2040.py
@@ -21,7 +21,7 @@ def populate_thread_hashes(apps, schema_editor):
 
     for original_submission in Submission.objects.filter(is_resubmission_of__isnull=True):
         children_ids = get_thread_ids(original_submission, [original_submission.id])
-        Submission.objects.filter(id__in=children_ids).update(thread_hash=uuid.uuid4())
+        Submission.objects.filter(id__in=children_ids).update(thread_hash=original_submission.thread_hash)
 
 
 class Migration(migrations.Migration):