diff --git a/mandaye/auth/authform.py b/mandaye/auth/authform.py
index 2c75e94..cd42e56 100644
--- a/mandaye/auth/authform.py
+++ b/mandaye/auth/authform.py
@@ -268,8 +268,13 @@ a password_field key if you want to encode a password.")
             env['beaker.session']['old_association_id'] = None
             env['beaker.session'][self.site_name] = association['id']
             env['beaker.session'].save()
+            next_url = None
             if qs.has_key('next_url'):
-                return _302(qs['next_url'][0], response.cookies)
+                next_url = qs['next_url'][0]
+            elif values.has_key('next_url'):
+                next_url = values['next_url']
+            if next_url:
+                return _302(next_url, response.cookies)
             else:
                 return response
         else: