diff --git a/helpdesk/forms.py b/helpdesk/forms.py
index b7827aee..dba1e6a0 100644
--- a/helpdesk/forms.py
+++ b/helpdesk/forms.py
@@ -59,8 +59,8 @@ class EditTicketForm(forms.ModelForm):
                 instanceargs['max_digits'] = field.max_length
             elif field.data_type == 'list':
                 fieldclass = forms.ChoiceField
+                choices = field.choices_as_array
                 if field.empty_selection_list:
-                    choices = field.choices_as_array
                     choices.insert(0, ('','---------' ) )
                 instanceargs['choices'] = choices
             elif field.data_type == 'boolean':
@@ -409,8 +409,8 @@ class PublicTicketForm(forms.Form):
                 instanceargs['max_digits'] = field.max_length
             elif field.data_type == 'list':
                 fieldclass = forms.ChoiceField
+                choices = field.choices_as_array
                 if field.empty_selection_list:
-                    choices = field.choices_as_array
                     choices.insert(0, ('','---------' ) )
                 instanceargs['choices'] = choices
             elif field.data_type == 'boolean':