--- a/reg/views.py	Thu Apr 15 19:19:08 2010 +0530
+++ b/reg/views.py	Thu Apr 15 19:53:52 2010 +0530
@@ -89,11 +89,10 @@
                                               interests=data['interests']
                                              )
 
-            reg_events.send_activation(new_user)
             if event:
                 event.attendees.add(new_user)
                 event.save()
-
+            reg_events.send_activation(new_user)
             return redirect('/reg/account_created')
         else:
             return render_to_response('register.html', {'form':form, 'event':event})
@@ -114,7 +113,7 @@
     """
 
     user = request.user
-    if user.is_authenticated():
+    if user.is_authenticated() and user.is_active:
         return redirect('/reg')
 
     try: