--- trunk/lib/Transports/Dispatcher.pm	2006/05/27 17:23:34	39
+++ trunk/lib/Transports/Dispatcher.pm	2006/05/27 22:09:29	40
@@ -76,12 +76,16 @@
 
 =cut
 
-on 'login', run {
+on qr'^/login(/.*)?$', run {
+
+	my $return_url = $1 || '/';
+
     set 'action' =>
         Jifty->web->new_action( class => 'Login', moniker => 'loginbox' );
     set 'next' => Jifty->web->request->continuation
         || Jifty::Continuation->new(
-        request => Jifty::Request->new( path => "/" ) );
+        request => Jifty::Request->new( path => $return_url ) );
+	show '/login';
 };
 
 =head2 logout