diff --git a/people/forms.py b/people/forms.py
index 2adc9d6..afa2207 100644
--- a/people/forms.py
+++ b/people/forms.py
@@ -107,6 +107,8 @@ class PersonAnswerSetForm(forms.ModelForm, DynamicAnswerSetBase):
         self.instance.person_id = self.initial['person_id']
         if commit:
             self.instance.save()
+            # Need to call same_m2m manually since we use commit=False above
+            self.save_m2m()
 
         if commit:
             # Save answers to relationship questions
diff --git a/people/models/person.py b/people/models/person.py
index 408e73c..03ab88b 100644
--- a/people/models/person.py
+++ b/people/models/person.py
@@ -214,7 +214,6 @@ class PersonAnswerSet(AnswerSet):
             'replaced_timestamp',
             'person_id',
             'question_answers',
-            'themes',
         }
 
         def field_value_repr(field):