--- a/project/scipycon/registration/views.py	Mon Nov 15 15:46:51 2010 +0530
+++ b/project/scipycon/registration/views.py	Mon Nov 15 15:47:29 2010 +0530
@@ -247,7 +247,7 @@
             wifi = wifi_form.save(registrant, scope_entity)
             acco = acco_form.save(registrant, scope_entity)
 
-            send_confirmation(registrant, scope_entity,password=passwd)
+            send_confirmation(registrant, scope_entity, password=passwd)
 
             redirect_to = reverse('scipycon_registrations',
                                   kwargs={'scope': scope})

--- a/project/scipycon/talk/forms.py	Mon Nov 15 15:46:51 2010 +0530
+++ b/project/scipycon/talk/forms.py	Mon Nov 15 15:47:29 2010 +0530
@@ -47,7 +47,7 @@
         required=False,
         widget=forms.TextInput(attrs={'size':'50'}))
     duration = forms.ChoiceField(choices=DURATION_CHOICES, required=True,
-        label=u'Preferred timeslot', help_text=u'Select preferred time slot')
+        label=u'Preferred time slot', help_text=u'Select preferred time slot')
     audience = forms.ChoiceField(choices=AUDIENCE_CHOICES, label=u'Intended audience',
         help_text=u'Select one of the available options or enter other type of intended audience')
 #    audience_other = forms.CharField(label=u'Other intended audience',