diff --git a/Netdisco/lib/Netdisco/Web/AuthN.pm b/Netdisco/lib/Netdisco/Web/AuthN.pm
index 6dc4c85e..a97a5863 100644
--- a/Netdisco/lib/Netdisco/Web/AuthN.pm
+++ b/Netdisco/lib/Netdisco/Web/AuthN.pm
@@ -24,7 +24,8 @@ post '/login' => sub {
             my $sum = Digest::MD5::md5_hex(param('password'));
             if ($sum and $sum eq $user->password) {
                 session(user => $user->username);
-                redirect param('path') || '/';
+                # redirect param('path') || '/'; FIXME requested_path?
+                redirect uri_for('/');
                 return;
             }
         }
@@ -34,7 +35,7 @@ post '/login' => sub {
 
 get '/logout' => sub {
     session->destroy;
-    redirect '/?logout=1';
+    redirect uri_for('/', {logout => 1});
 };
 
 true;
diff --git a/Netdisco/lib/Netdisco/Web/Device.pm b/Netdisco/lib/Netdisco/Web/Device.pm
index 28d50b49..b931cfb4 100644
--- a/Netdisco/lib/Netdisco/Web/Device.pm
+++ b/Netdisco/lib/Netdisco/Web/Device.pm
@@ -122,13 +122,13 @@ ajax '/ajax/content/device/details' => sub {
 get '/device' => sub {
     my $ip = NetAddr::IP::Lite->new(param('ip'));
     if (! $ip) {
-        redirect '/?nosuchdevice=1';
+        redirect uri_for('/', {nosuchdevice => 1});
         return;
     }
 
     my $device = schema('netdisco')->resultset('Device')->find($ip->addr);
     if (! $device) {
-        redirect '/?nosuchdevice=1';
+        redirect uri_for('/', {nosuchdevice => 1});
         return;
     }