diff --git a/index.php b/index.php
index 4f8092a91c..189c55aa25 100755
--- a/index.php
+++ b/index.php
@@ -34,8 +34,8 @@
                              "frame_navbar" => "frames_navbar.tpl"
                             ));
 
-        $tpl->set_var("navbar_link",$phpgw->link("index.php?navbarframe=True"));
-        $tpl->set_var("body_link",$phpgw->link("index.php?framebody=True"));
+        $tpl->set_var("navbar_link",$phpgw->link("index.php","navbarframe=True"));
+        $tpl->set_var("body_link",$phpgw->link("index.php","framebody=True"));
 
         if ($phpgw_info["user"]["preferences"]["common"]["frame_navbar_location"] == "bottom") {
            $tpl->set_var("frame_size","*,60");
diff --git a/phpgwapi/phpgw_accounts_shared.inc.php b/phpgwapi/phpgw_accounts_shared.inc.php
index 98acb8c5a0..3f16089beb 100644
--- a/phpgwapi/phpgw_accounts_shared.inc.php
+++ b/phpgwapi/phpgw_accounts_shared.inc.php
@@ -221,8 +221,14 @@
     function delete($app_name,$var)
     {
       global $phpgw_info;
-      unset($phpgw_info["user"]["preferences"][$app_name][$var]);
-    
+      unset($phpgw_info["user"]["preferences"][$app_name][$var]);    
+    }
+
+    // This will kill all preferences within a certain app
+    function reset($app_name)
+    {
+      global $phpgw_info;
+      $phpgw_info["user"]["preferences"][$app_name] = array();
     }
   } //end of preferences class
 
diff --git a/preferences/settings.php b/preferences/settings.php
index b9a6de375f..4665f24893 100755
--- a/preferences/settings.php
+++ b/preferences/settings.php
@@ -20,7 +20,7 @@
   include("../header.inc.php");
 
   if (! $submit) {
-     if ($phpgw_info["server"]["useframes"] == "allowed") {
+     if ($phpgw_info["server"]["useframes"] != "never") {
         $target = ' target="_top"';
      }
      ?>
@@ -56,7 +56,7 @@
        </tr>
        <?php
          }
-         if ($phpgw_info["server"]["useframes"] == "always") {
+         if ($phpgw_info["server"]["useframes"] != "never") {
        ?>
        <tr>
         <td><?php echo lang("Navigation bar frame location"); ?>: </td>
@@ -202,6 +202,7 @@
      $phpgw->common->phpgw_footer();
   } else {
 
+     $phpgw->preferences->reset("common");
      while ($setting = each($settings)) {
         $phpgw->preferences->change("common",$setting[0],$setting[1]);
      }