--- views.py.orig       2010-08-11 23:17:38.000000000 -0500
+++ views.py    2010-08-11 22:58:13.000000000 -0500
@@ -24,17 +24,23 @@
         form = form_class(request.POST)
         if form.is_valid():
             username, password = form.save()
-            user = authenticate(username=username, password=password)

+            user = authenticate(username=username, password=password)
+
             signup_code = form.cleaned_data["signup_code"]
             signup_code.use(user)
-
-            auth_login(request, user)
-            request.user.message_set.create(
-                message=ugettext("Successfully logged in as %(username)s.") % {
-                'username': user.username
-            })
-            return HttpResponseRedirect(success_url)
+
+            if settings.ACCOUNT_EMAIL_VERIFICATION:
+                return render_to_response("account/verification_sent.html", {
+                        "email": form.cleaned_data["email"],
+                        }, context_instance=RequestContext(request))
+            else:
+                auth_login(request, user)
+                request.user.message_set.create(
+                    message=ugettext("Successfully logged in as %(username)s.") % {
+                        'username': user.username
+                        })
+                return HttpResponseRedirect(success_url)
     else:
         signup_code = check_signup_code(code)
         if signup_code: