diff --git a/ietf/mailinglists/views.py b/ietf/mailinglists/views.py
index 72b463be4..9d529378d 100644
--- a/ietf/mailinglists/views.py
+++ b/ietf/mailinglists/views.py
@@ -74,14 +74,16 @@ class NonWgWizard(wizard.Wizard):
 	return templates
     def render_template(self, *args, **kwargs):
 	self.extra_context['clean_forms'] = self.clean_forms
-        form0 = self.clean_forms[0]
-        add_edit = form0.clean_data['add_edit']
 	if self.step == 3:
+            form0 = self.clean_forms[0]
+            add_edit = form0.clean_data['add_edit']
 	    if add_edit == 'add' or add_edit == 'edit':
 		# Can't get the choice mapping directly from the form
 		self.extra_context['area'] = formchoice(self.clean_forms[1], 'area')
 		self.extra_context['approver'] = formchoice(self.clean_forms[2], 'approver')
         if self.step == 2 and add_edit == 'delete':
+            form0 = self.clean_forms[0]
+            add_edit = form0.clean_data['add_edit']
             self.extra_context['list_q'] = NonWgMailingList.objects.get(pk=self.clean_forms[0].clean_data['list_id_delete'])
             self.extra_context['approver'] =  formchoice(self.clean_forms[1], 'approver')
 	return super(NonWgWizard, self).render_template(*args, **kwargs)
diff --git a/ietf/templates/mailinglists/nwg_wizard_addedit_step1.html b/ietf/templates/mailinglists/nwg_wizard_addedit_step1.html
index ffdbeda52..3b9b0bae4 100644
--- a/ietf/templates/mailinglists/nwg_wizard_addedit_step1.html
+++ b/ietf/templates/mailinglists/nwg_wizard_addedit_step1.html
@@ -5,7 +5,7 @@ tr > th { text-align: left; vertical-align: top; }
 {% endblock %}
 
 {% block nwgcontent %}
-<h2>Step 2</h2>
+<h2>Step {{ step|add:"1" }}</h2>
 <h4>Please provide the following information:</h4>
 
 <form action="." method="POST">