diff --git a/scipost_django/submissions/forms/__init__.py b/scipost_django/submissions/forms/__init__.py
index 8d5a4f6ff36a37133836182139f30bbf77c0bf19..97571d764c2fc13c585a8a240b3ff8ff4b23ddb2 100644
--- a/scipost_django/submissions/forms/__init__.py
+++ b/scipost_django/submissions/forms/__init__.py
@@ -1486,27 +1486,6 @@ class SubmissionForm(forms.ModelForm):
                 + str(kwargs["initial"].get("acad_field").id)
             )
 
-        core_version_doi = self.submitted_to_journal.doi_label
-        if not core_version_doi.endswith("Core"):
-            core_version_doi += "Core"
-        self.fields["fulfilled_expectations"].help_text = (
-            """<div class="mt-2">Please indicate which <a href='{expectations_url}'>journal expectations</a> you assert are being fulfilled by this Submission. 
-            At least one should be fulfilled for publication in {journal_name}. <br>
-            This information will be publicly visible and scrutinized during the refereeing process. 
-            Looking for a more accessible alternative? Consider <a href='{core_url}{thread_hash_get_param}'>submitting to {journal_name} Core</a>.</div>""".format(
-                expectations_url=reverse_lazy(
-                    "journal:about", args=[self.submitted_to_journal.doi_label]
-                )
-                + "#criteria",
-                journal_name=self.submitted_to_journal.name,
-                core_url=reverse_lazy(
-                    "submissions:submit_choose_preprint_server", args=[core_version_doi]
-                ),
-                thread_hash_get_param=(
-                    f"?thread_hash={self.thread_hash}" if self.thread_hash else ""
-                ),
-            )
-        )
         object_types = self.submitted_to_journal.submission_object_types["options"]
 
         def require_type(str):
@@ -1563,6 +1542,25 @@ class SubmissionForm(forms.ModelForm):
         if not expectations_allowed:
             del self.fields["fulfilled_expectations"]
         else:
+            self.fields["fulfilled_expectations"].help_text = (
+                """<div class="mt-2">Please indicate which <a href='{expectations_url}'>journal expectations</a> you assert are being fulfilled by this Submission. 
+                At least one should be fulfilled for publication in {journal_name}. <br>
+                This information will be publicly visible and scrutinized during the refereeing process. 
+                Looking for a more accessible alternative? Consider <a href='{core_url}{thread_hash_get_param}'>submitting to {journal_name} Core</a>.</div>""".format(
+                    expectations_url=reverse_lazy(
+                        "journal:about", args=[self.submitted_to_journal.doi_label]
+                    )
+                    + "#criteria",
+                    journal_name=self.submitted_to_journal.name,
+                    core_url=reverse_lazy(
+                        "submissions:submit_choose_preprint_server",
+                        args=[self.submitted_to_journal.doi_label + "Core"],
+                    ),
+                    thread_hash_get_param=(
+                        f"?thread_hash={self.thread_hash}" if self.thread_hash else ""
+                    ),
+                )
+            )
             self.fields["fulfilled_expectations"].choices = (
                 self.submitted_to_journal.expectations
             )