diff --git a/preferences/inc/hook_preferences.inc.php b/preferences/inc/hook_preferences.inc.php
index 9eaa7c3880..72014c74d0 100644
--- a/preferences/inc/hook_preferences.inc.php
+++ b/preferences/inc/hook_preferences.inc.php
@@ -29,10 +29,10 @@
 
   // Actual content
   if ($phpgw->acl->check('changepassword',1)) {
-			echo "<a href=\"" . $phpgw->link("changepassword.php") . "\">"
+			echo "<a href=\"" . $phpgw->link('/preferences/changepassword.php') . "\">"
      . lang("change your password") . "</a>";
 	}
-  echo "<br><a href=\"" . $phpgw->link("settings.php") . "\">"
+  echo "<br><a href=\"" . $phpgw->link('/preferences/settings.php') . "\">"
      . lang("change your settings") . "</a>";
 //  echo "<br><a href=\"" . $phpgw->link("changeprofile.php") . "\">"
 //     . lang("change your profile") . "</a>";
diff --git a/preferences/settings.php b/preferences/settings.php
index ee93f42163..823d212106 100755
--- a/preferences/settings.php
+++ b/preferences/settings.php
@@ -42,7 +42,7 @@
         $target = ' target="_top"';
      }
      ?>
-      <form method="POST" action="<?php echo $phpgw->link("settings.php"); ?>"<?php echo $target; ?>>
+      <form method="POST" action="<?php echo $phpgw->link('/preferences/settings.php'); ?>"<?php echo $target; ?>>
        <table border=0>
        <tr>
         <td><?php echo lang("max matchs per page"); ?>: </td>
@@ -271,10 +271,10 @@
      $pref->save_repository();
 
      if ($phpgw_info['server']['useframes'] != 'never') {
-        Header('Location: ' . $phpgw->link($phpgw_info['server']['webserver_url'] . '/preferences/index.php'));
+        Header('Location: ' . $phpgw->link('/preferences/index.php'));
         $phpgw->common->phpgw_exit();
      }
 
-     Header('Location: ' . $phpgw->link('index.php'));
+     Header('Location: ' . $phpgw->link('/preferences/index.php'));
   }
 ?>