diff --git a/password_policy.module b/password_policy.module
index 54942ff..bc8e9eb 100644
--- a/password_policy.module
+++ b/password_policy.module
@@ -31,7 +31,7 @@ function password_policy_init() {
   $account = user_load($GLOBALS['user']->uid);
 
   // Check password reset status and force a reset if needed.
-  $change_password_url = 'user/'. $account->uid .'/'. (module_exists('password_policy_password_tab') ? 'password' : 'edit');
+  $change_password_url = 'user/'. $account->uid .'/edit'. (module_exists('password_policy_password_tab') ? '/password' : '');
   if ($account->force_password_change && $_GET['q'] != $change_password_url) {
     // let users log out
     if (arg(0) != 'logout') {
@@ -304,7 +304,7 @@ function password_policy_user($op, &$edit, &$account, $category = NULL) {
             drupal_set_message(format_plural($days_left, 'Your password will expire in less than one day. Please change it.', 'Your password will expire in less than @count days. Please change it.'));
             $destination = drupal_get_destination();
             unset($_REQUEST['destination']);
-            drupal_goto('user/'. $account->uid .'/'. (module_exists('password_policy_password_tab') ? 'password' : 'edit'), $destination);
+            drupal_goto('user/'. $account->uid .'/edit'. (module_exists('password_policy_password_tab') ? '/password' : ''), $destination);
           }
         }
       }
@@ -617,7 +617,7 @@ function password_policy_mail_tokens($params, $language) {
    '!uri_brief' => drupal_substr($base_url, drupal_strlen('http://')),
    '!date' => format_date(time(), 'medium', '', NULL, $language->language),
    '!login_uri' => url('user', array('absolute' => TRUE)),
-   '!edit_uri' => url('user/'. $account->uid .'/'. (module_exists('password_policy_password_tab') ? 'password' : 'edit'), array('absolute' => TRUE)),
+   '!edit_uri' => url('user/'. $account->uid .'/edit'. (module_exists('password_policy_password_tab') ? '/password' : ''), array('absolute' => TRUE)),
    '!days_left' => isset($params['days_left']) ? $params['days_left'] : NULL,
    '!login_url' => isset($params['login_url']) ? $params['login_url'] : NULL,
   );