diff --git a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
index d98879d0ed..627d1b43eb 100644
--- a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
+++ b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
@@ -139,7 +139,10 @@ final class PhabricatorAuthOneTimeLoginController
             ->save();
         unset($unguarded);
 
-        $next = (string)id(new PhutilURI('/settings/panel/password/'))
+        $username = $target_user->getUsername();
+        $panel_uri = "/settings/user/{$username}/page/password/";
+
+        $next = (string)id(new PhutilURI($panel_uri))
           ->setQueryParams(
             array(
               'key' => $key,