diff --git a/contrib/password_tab/password_policy_password_tab.module b/contrib/password_tab/password_policy_password_tab.module
index 71a0b41..5a74a5a 100644
--- a/contrib/password_tab/password_policy_password_tab.module
+++ b/contrib/password_tab/password_policy_password_tab.module
@@ -77,7 +77,7 @@ function password_policy_password_tab_exit($destination = NULL) {
         // Prevent loops.
         $processed = TRUE;
         // Change the drupal_goto to our change password tab.
-        $path .= '/password';
+        $path .= preg_replace('/\/edit$/', '/\/password/', $path);
         $opts = array();
         if (!empty($url_parts['fragment'])) {
           $opts['fragment'] = $url_parts['fragment'];