diff --git a/src/views/ProfileForm.vue b/src/views/ProfileForm.vue
index 5906f8e..8452d86 100644
--- a/src/views/ProfileForm.vue
+++ b/src/views/ProfileForm.vue
@@ -65,7 +65,7 @@
             </a>
           </div>
           <button
-            v-if="form.fields_attributes.length <= extraFieldMaxCount"
+            v-if="canAddExtraField()"
             type="button"
             class="add-extra-field"
             @click="addExtraField()"
@@ -174,7 +174,7 @@ function isValidExtraField(index: number): boolean {
   const field = form.fields_attributes[index]
   for (let prevIndex = 0; prevIndex < index; prevIndex++) {
     const prevField = form.fields_attributes[prevIndex]
-    if (field.name === prevField.name) {
+    if (field.name && field.name === prevField.name) {
       // Label is not unique
       return false
     }
@@ -186,6 +186,10 @@ function removeExtraField(index: number) {
   form.fields_attributes.splice(index, 1)
 }
 
+function canAddExtraField(): boolean {
+  return form.fields_attributes.length <= extraFieldMaxCount
+}
+
 function addExtraField() {
   form.fields_attributes.push({ name: "", value: "", value_source: "" })
 }