diff --git a/web/panettone/src/panettone.lisp b/web/panettone/src/panettone.lisp
index 3d1bf41b4..15d3ba757 100644
--- a/web/panettone/src/panettone.lisp
+++ b/web/panettone/src/panettone.lisp
@@ -365,7 +365,8 @@ successful, `nil' otherwise"
     (progn
       (setf (hunchentoot:session-value 'user) user)
       (hunchentoot:redirect (or original-uri "/")))
-    (render/login :message "Invalid credentials")))
+    (render/login :message "Invalid credentials"
+                  :original-uri original-uri)))
 
 (defroute logout ("/logout" :method :post) ()
   (hunchentoot:delete-session-value 'user)