diff --git a/pinaxcon/proposals/forms.py b/pinaxcon/proposals/forms.py
index b8d52ad8f67d4ca54aed792e45dd1c3cb840972d..b2a3337c7ca9661505e584d22a80353032e12fcb 100644
--- a/pinaxcon/proposals/forms.py
+++ b/pinaxcon/proposals/forms.py
@@ -1,9 +1,34 @@
 from django import forms
+from symposion.proposals.forms import ProposalMixIn
 
-from .models import TalkProposal
+from .models import ConferenceSpeaker, TalkProposal
 
 
-class ProposalForm(forms.ModelForm):
+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, ProposalMixIn):
+
+    def __init__(self, *a, **k):
+        super(ProposalForm, self).__init__(*a, **k)
+        self.description_required()
+        self.abstract_required()
 
     def clean_description(self):
         value = self.cleaned_data["description"]
@@ -20,9 +45,12 @@ class TalkProposalForm(ProposalForm):
         model = TalkProposal
         fields = [
             "title",
-            "audience_level",
             "description",
             "abstract",
+            "new_presentation",
+            "extended_presentation",
             "additional_notes",
+            "extra_av",
+            "slides_release",
             "recording_release",
         ]