diff --git a/pinaxcon/proposals/forms.py b/pinaxcon/proposals/forms.py
index b8d52ad8f67d4ca54aed792e45dd1c3cb840972d..0bbbe91868ac5c5ed7522cba0b745ebdb88e38e1 100644
--- a/pinaxcon/proposals/forms.py
+++ b/pinaxcon/proposals/forms.py
@@ -1,6 +1,25 @@
 from django import forms
 
-from .models import TalkProposal
+from .models import ConferenceSpeaker, TalkProposal
+
+
+class ConferenceSpeakerForm(forms.ModelForm):
+
+    class Meta:
+        model = ConferenceSpeaker
+        exclude = [
+            'user',
+            'biography_html',
+            'experience_html',
+            'invite_email',
+            'invite_token',
+            'annotation',
+        ]
+
+    def __init__(self, *a, **k):
+        super(ConferenceSpeakerForm, self).__init__(*a, **k)
+        self.fields['code_of_conduct'].required = True
+
 
 
 class ProposalForm(forms.ModelForm):