diff --git a/scipost/forms.py b/scipost/forms.py
index dae0ae808fea8310bd616fa35ae3488777d84aeb..854726e9340cde25096fd105d51395ddd1ca7ec5 100644
--- a/scipost/forms.py
+++ b/scipost/forms.py
@@ -19,7 +19,8 @@ from captcha.fields import ReCaptchaField
 from ajax_select.fields import AutoCompleteSelectField
 from haystack.forms import ModelSearchForm as HayStackSearchForm
 
-from .constants import SCIPOST_DISCIPLINES, TITLE_CHOICES, SCIPOST_FROM_ADDRESSES
+from .constants import SCIPOST_DISCIPLINES, TITLE_CHOICES, SCIPOST_FROM_ADDRESSES,\
+    INVITATION_CITED_SUBMISSION, INVITATION_CITED_PUBLICATION
 from .decorators import has_contributor
 from .models import Contributor, DraftInvitation, RegistrationInvitation,\
                     UnavailabilityPeriod, PrecookedEmail
@@ -219,6 +220,16 @@ class RegistrationInvitationForm(forms.ModelForm):
             queryset=Publication.objects.all().order_by('-publication_date'),
             required=False)
 
+    def clean(self):
+        data = self.cleaned_data
+        if data.get('invitation_type') == INVITATION_CITED_SUBMISSION:
+            if not data.get('cited_in_submission'):
+                self.add_error('cited_in_submission', 'Please state the Submission cited.')
+        if data.get('invitation_type') == INVITATION_CITED_PUBLICATION:
+            if not data.get('cited_in_publication'):
+                self.add_error('cited_in_publication', 'Please state the Publication cited.')
+        return data
+
     def clean_email(self):
         email = self.cleaned_data['email']
         if RegistrationInvitation.objects.filter(email=email).exists():
diff --git a/scipost/templates/scipost/draft_registration_invitation.html b/scipost/templates/scipost/draft_registration_invitation.html
index 6724952a0e9522b0c91b8df0f3c6f37d66b4777f..fe8d1f61f63f3f9364dd233cc4815a3398ea742b 100644
--- a/scipost/templates/scipost/draft_registration_invitation.html
+++ b/scipost/templates/scipost/draft_registration_invitation.html
@@ -49,7 +49,7 @@ $(document).ready(function(){
               {% csrf_token %}
               {{draft_inv_form.media}}
               {{draft_inv_form|bootstrap}}
-              <input type="submit" class="btn btn-secondary"/>
+              <input type="submit" class="btn btn-primary" value="Submit"/>
         </form>
     </div>
 </div>
diff --git a/scipost/templates/scipost/registration_invitations.html b/scipost/templates/scipost/registration_invitations.html
index cc5a6922d58967980a3431416ae490513f42b2b7..bcd610d61a0b261225a22c21b222e0e5f2f8f528 100644
--- a/scipost/templates/scipost/registration_invitations.html
+++ b/scipost/templates/scipost/registration_invitations.html
@@ -56,7 +56,7 @@ $(document).ready(function(){
             {% csrf_token %}
             {{reg_inv_form.media}}
             {{reg_inv_form|bootstrap}}
-            <input type="submit" class="btn btn-secondary">
+            <input type="submit" class="btn btn-primary" value="Submit">
         </form>
     </div>
 </div>