diff --git a/opentech/apply/funds/management/commands/migrate_fellowship_application.py b/opentech/apply/funds/management/commands/migrate_fellowship_application.py
index 119dfec467da51ebef9fde3c4394f1eb6f8aa811..5e33d7fd0a45828ee645d98c513924466fdfb3f8 100644
--- a/opentech/apply/funds/management/commands/migrate_fellowship_application.py
+++ b/opentech/apply/funds/management/commands/migrate_fellowship_application.py
@@ -15,7 +15,6 @@ class Command(MigrateCommand):
         "field_application_name": {
             "id": "full_name",
             "type": "value",
-            # If no Drupal value key is specified, we default to 'value'
             "key": "safe_value",
         },
         "field_application_mail": {
diff --git a/opentech/apply/funds/management/commands/migrate_fellowship_proposals.py b/opentech/apply/funds/management/commands/migrate_fellowship_proposals.py
index 7b46c1502da8153335834996c27488903646481f..e9b319872604ecb527dc557cd401d84345410c11 100644
--- a/opentech/apply/funds/management/commands/migrate_fellowship_proposals.py
+++ b/opentech/apply/funds/management/commands/migrate_fellowship_proposals.py
@@ -15,7 +15,6 @@ class Command(MigrateCommand):
         "field_proposal_common_name": {
             "id": "full_name",
             "type": "value",
-            # If no Drupal value key is specified, we default to 'value'
             "key": "safe_value",
         },
 
diff --git a/opentech/apply/funds/management/commands/migration_base.py b/opentech/apply/funds/management/commands/migration_base.py
index 76e21b981fa55b2f1a2c84377286810d4322d603..3e90de2c108276c9a2715f4f9525b5b60a31bff9 100644
--- a/opentech/apply/funds/management/commands/migration_base.py
+++ b/opentech/apply/funds/management/commands/migration_base.py
@@ -101,7 +101,7 @@ class MigrateCommand(BaseCommand):
         if "value" not in form_data:
             form_data["value"] = 0
 
-        if not form_data["duration"]:
+        if "duration" not in form_data or not form_data["duration"]:
             form_data["duration"] = "1"
 
         submission.form_data = form_data
diff --git a/opentech/apply/funds/management/commands/seed_fellowship.py b/opentech/apply/funds/management/commands/seed_fellowship.py
index 6b84f43a3dd5c036b756c3c9d616398d03f17d9e..5fdc615c31b88f3c75361fb00ae0b83edba9bbec 100644
--- a/opentech/apply/funds/management/commands/seed_fellowship.py
+++ b/opentech/apply/funds/management/commands/seed_fellowship.py
@@ -94,6 +94,8 @@ class Command(BaseCommand):
         data2 = [
             {"type": "text_markup", "value": "<h3>Proposal information</h3>", "id": ""},
             {"type": "title", "value": {"field_label": "Proposal title", "help_text": "", "info": None}, "id": ""},
+            {"type": "full_name", "value": {"field_label": "Your name", "help_text": "", "info": None}, "id": "c0c75948-b3c3-42be-8646-bc2a5d8521c3"},
+            {"type": "email", "value": {"field_label": "E-mail", "help_text": "", "info": None}, "id": "a607ec56-da2a-46d4-b0c9-7c8f3c351a6e"},
             {"type": "value", "value": {"field_label": "If you are applying for direct funding, how much do you need?", "help_text": "Amount requested should be less than 50000 USD.", "info": None}, "id": "cfae89dc-f327-45f4-80e9-f267c3bd1ec7"},
             {"type": "duration", "value": {"field_label": "How long do you want to work on this fellowship?", "help_text": "", "info": None}, "id": "08b9b5c3-e01d-41ac-95be-600a4fee7d87"},
             {"type": "char", "value": {"field_label": "Host organisation", "help_text": "", "required": "", "format": "", "default_value": ""}, "id": "bc03235e-3c78-4770-9fc2-97feb93c2c8c"},