diff --git a/castellum/recruitment/management/commands/create_demo_content.py b/castellum/recruitment/management/commands/create_demo_content.py
index 5db9b81168f2cfb89b55b2f1aede4881fecacc23..33f9047ef22ddc847cea402cea000a5415364754 100644
--- a/castellum/recruitment/management/commands/create_demo_content.py
+++ b/castellum/recruitment/management/commands/create_demo_content.py
@@ -158,13 +158,19 @@ def fake_contact(subject):
         first_name = fake.first_name_male()
         last_name = fake.last_name_male()
 
+    if settings.CASTELLUM_DATE_OF_BIRTH_ATTRIBUTE_ID:
+        key = 'd%i' % settings.CASTELLUM_DATE_OF_BIRTH_ATTRIBUTE_ID
+        date_of_birth = subject.attributes.get(key)
+    else:
+        date_of_birth = fake_date_of_birth()
+
     contact = Contact(
         gender=gender,
         first_name=first_name,
         first_name_phonetic=phonetic(first_name),
         last_name=last_name,
         last_name_phonetic=phonetic(last_name),
-        date_of_birth=fake_date_of_birth(),
+        date_of_birth=date_of_birth,
         subject_id=subject.pk,
     )
 
@@ -220,18 +226,12 @@ def generate_subjects(count):
     subjects = Subject.objects.all()[:count]
 
     print('Generating contacts')
-    contacts = [fake_contact(subjects[i]) for i in range(count-1)]
-    testcontact = Contact(
-        gender='*',
-        first_name='Muhammad',
-        first_name_phonetic=phonetic('Muhammad'),
-        last_name='Nguyen',
-        last_name_phonetic=phonetic('Nguyen'),
-        date_of_birth='2000-12-13',
-        email='muhammad@example.com',
-        subject_id=subjects[count - 1].pk,
-    )
-    contacts.append(testcontact)
+    contacts = [fake_contact(subjects[i]) for i in range(count)]
+    contacts[-1].first_name = 'Muhammad'
+    contacts[-1].first_name_phonetic = phonetic('Muhammad')
+    contacts[-1].last_name = 'Nguyen'
+    contacts[-1].last_name_phonetic = phonetic('Nguyen')
+    contacts[-1].email = 'muhammad@example.com'
 
     Contact.objects.bulk_create(contacts)
     contacts = Contact.objects.all()[:count]