diff --git a/opentech/apply/activity/forms.py b/opentech/apply/activity/forms.py
index cb95f8bf86e12b57bdb15314e0d2d99fba2b5190..f5d17d442874690bd657bb5c367025af9c3776ae 100644
--- a/opentech/apply/activity/forms.py
+++ b/opentech/apply/activity/forms.py
@@ -25,7 +25,8 @@ class CommentForm(forms.ModelForm):
         self.allowed_visibility = self._meta.model.visibility_for(user)
         self.visibility_choices = self._meta.model.visibility_choices_for(user)
         visibility = self.fields['visibility']
-        visibility.initial = self.visibility_choices[0]
+        # Set default visibility to "team" for staff and to "applicant" for everyone else.
+        visibility.initial = self.visibility_choices[1] if user.is_apply_staff else self.visibility_choices[0]
         if len(self.visibility_choices) > 1:
             visibility.choices = self.visibility_choices
             visibility.help_text = mark_safe('<br>'.join(