diff --git a/opentech/apply/categories/blocks.py b/opentech/apply/categories/blocks.py
index 8aa502e3afbf0593317ea7049e5e8198051d0921..ecd61dc8c8151f7f7332db1bff15624c6fe2604e 100644
--- a/opentech/apply/categories/blocks.py
+++ b/opentech/apply/categories/blocks.py
@@ -42,9 +42,11 @@ class CategoryQuestionBlock(FormFieldBlock):
             return forms.ChoiceField
 
     def use_defaults_from_category(self, kwargs, category):
+        map = {'field_label': 'label', 'help_text': 'help_text'}
+
         for field in ['field_label', 'help_text']:
-            if not kwargs[field]:
-                kwargs[field] = getattr(category, field)
+            if field not in kwargs:
+                kwargs[map[field]] = getattr(category, field)
 
         return kwargs