diff --git a/extra/furnace/auth/features/recover-password/recover-1.xml b/extra/furnace/auth/features/recover-password/recover-1.xml
index 21fbe6fd39..46e52d5319 100644
--- a/extra/furnace/auth/features/recover-password/recover-1.xml
+++ b/extra/furnace/auth/features/recover-password/recover-1.xml
@@ -6,7 +6,7 @@
 
 	<p>Enter the username and e-mail address you used to register for this site, and you will receive a link for activating a new password.</p>
 
-	<t:form t:action="recover-password">
+	<t:form t:action="$realm/recover-password">
 
 		<table>
 
diff --git a/extra/furnace/auth/features/recover-password/recover-3.xml b/extra/furnace/auth/features/recover-password/recover-3.xml
index 2e412d1f18..a71118ea31 100644
--- a/extra/furnace/auth/features/recover-password/recover-3.xml
+++ b/extra/furnace/auth/features/recover-password/recover-3.xml
@@ -6,7 +6,7 @@
 
 	<p>Choose a new password for your account.</p>
 
-	<t:form t:action="new-password">
+	<t:form t:action="$realm/recover-3">
 
 		<table>
 
diff --git a/extra/furnace/auth/features/recover-password/recover-4.xml b/extra/furnace/auth/features/recover-password/recover-4.xml
index f5d02fa858..d71a01bc25 100755
--- a/extra/furnace/auth/features/recover-password/recover-4.xml
+++ b/extra/furnace/auth/features/recover-password/recover-4.xml
@@ -4,6 +4,6 @@
 
 	<t:title>Recover lost password: step 4 of 4</t:title>
 
-	<p>Your password has been reset. You may now <t:a t:href="login">log in</t:a>.</p>
+	<p>Your password has been reset. You may now <t:a t:href="$realm">proceed</t:a>.</p>
 
 </t:chloe>
diff --git a/extra/furnace/auth/features/recover-password/recover-password.factor b/extra/furnace/auth/features/recover-password/recover-password.factor
index 806df024f0..93b3a7ad73 100644
--- a/extra/furnace/auth/features/recover-password/recover-password.factor
+++ b/extra/furnace/auth/features/recover-password/recover-password.factor
@@ -1,8 +1,9 @@
 ! Copyright (c) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: namespaces accessors kernel assocs arrays io.sockets threads
-fry urls smtp validators html.forms
-http http.server.responses http.server.dispatchers
+fry urls smtp validators html.forms present
+http http.server.responses http.server.redirection
+http.server.dispatchers
 furnace furnace.actions furnace.auth furnace.auth.providers
 furnace.redirection ;
 IN: furnace.auth.features.recover-password
@@ -13,13 +14,12 @@ SYMBOL: lost-password-from
     request get url>> host>> host-name or ;
 
 : new-password-url ( user -- url )
-    "recover-3"
-    swap [
-        [ username>> "username" set ]
-        [ ticket>> "ticket" set ]
+    URL" recover-3" clone
+        swap
+        [ username>> "username" set-query-param ]
+        [ ticket>> "ticket" set-query-param ]
         bi
-    ] H{ } make-assoc
-    derive-url ;
+    adjust-url relative-to-request ;
 
 : password-email ( user -- email )
     <email>
@@ -35,7 +35,7 @@ SYMBOL: lost-password-from
             "If you believe that this request was legitimate, you may click the below link in\n" %
             "your browser to set a new password for your account:\n" %
             "\n" %
-            swap new-password-url %
+            swap new-password-url present %
             "\n\n" %
             "Love,\n" %
             "\n" %
@@ -48,7 +48,7 @@ SYMBOL: lost-password-from
 
 : <recover-action-1> ( -- action )
     <page-action>
-        { realm "recover-1" } >>template
+        { realm "features/recover-password/recover-1" } >>template
 
         [
             {
@@ -64,12 +64,12 @@ SYMBOL: lost-password-from
                 send-password-email
             ] when*
 
-            URL" $login/recover-2" <redirect>
+            URL" $realm/recover-2" <redirect>
         ] >>submit ;
 
 : <recover-action-2> ( -- action )
     <page-action>
-        { realm "recover-2" } >>template ;
+        { realm "features/recover-password/recover-2" } >>template ;
 
 : <recover-action-3> ( -- action )
     <page-action>
@@ -80,7 +80,7 @@ SYMBOL: lost-password-from
             } validate-params
         ] >>init
 
-        { realm "recover-3" } >>template
+        { realm "features/recover-password/recover-3" } >>template
 
         [
             {
@@ -100,7 +100,7 @@ SYMBOL: lost-password-from
                 "new-password" value >>encoded-password
                 users update-user
 
-                URL" $login/recover-4" <redirect>
+                URL" $realm/recover-4" <redirect>
             ] [
                 <403>
             ] if*
@@ -108,7 +108,7 @@ SYMBOL: lost-password-from
 
 : <recover-action-4> ( -- action )
     <page-action>
-        { realm "recover-4" } >>template ;
+        { realm "features/recover-password/recover-4" } >>template ;
 
 : allow-password-recovery ( login -- login )
     <recover-action-1> <auth-boilerplate>