diff --git a/password_policy.module b/password_policy.module
index e705298..a24261d 100644
--- a/password_policy.module
+++ b/password_policy.module
@@ -33,7 +33,7 @@ function password_policy_init() {
   $account = user_load($user->uid);
 
   // Check password reset status and force a reset if needed.
-  $change_password_url = ($url = variable_get('password_policy_change_url', NULL)) ? $url : 'user/' . $account->uid . '/' . '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
     $path = drupal_get_path_alias($_GET['q']);