diff --git a/comments/forms.py b/comments/forms.py
index 37cc85eef7b08697f79fbfdef7a975d40f003c51..6708b8174190cc73758a56156ddbb7bb7c1f64d6 100644
--- a/comments/forms.py
+++ b/comments/forms.py
@@ -47,7 +47,7 @@ class CommentForm(forms.ModelForm):
                     HTML('<br>'),
                     Div(
                         Submit('submit', 'Submit your Comment for vetting', css_class="submitComment"),
-                        HTML('<p id="goodCommenter"><i>By clicking on Submit, the commenter certifies that all sources used are duly referenced and cited. Failure to do so could lead to exclusion from the portal.</i></p>'),
+                        HTML('<p id="goodCommenter"><i>By clicking on Submit, the commenter agrees to the <a href="{% url \'scipost:terms_and_conditions\' %}">Terms and Conditions</a>.</i></p>'),
                         ),
                     css_class="col-3"),
                 css_class="row"),
diff --git a/submissions/views.py b/submissions/views.py
index c2d10397c094b1f2a8103a83dfccbffb4800491a..11971c49d512e4687dc6057acdbbb29a2aac0277 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -149,7 +149,7 @@ def submission_detail(request, submission_id):
                 date_submitted = timezone.now(),
                 )
             newcomment.save()
-            author.nr_comments += 1
+            author.nr_comments = Comment.objects.filter(author=author).count()
             author.save()
             request.session['submission_id'] = submission_id
             return HttpResponseRedirect(reverse('comments:comment_submission_ack'))