diff --git a/phpgwapi/inc/phpgw_common.inc.php b/phpgwapi/inc/phpgw_common.inc.php
index bb93774c91..f3019841fd 100644
--- a/phpgwapi/inc/phpgw_common.inc.php
+++ b/phpgwapi/inc/phpgw_common.inc.php
@@ -332,7 +332,12 @@
       global $phpgw_info;
       if ($appname == ""){$appname = $phpgw_info["flags"]["currentapp"];}
       if ($appname == "home" || $appname == "logout" || $appname == "login"){$appname = "phpgwapi";}
-      if (empty($phpgw_info["server"]["template_set"])){$phpgw_info["server"]["template_set"] = "default";}
+
+      if ($phpgw_info["server"]["template_set"] == "user_choice" && isset($phpgw_info["user"]["preferences"]["template_set"])){
+        $phpgw_info["server"]["template_set"] = $phpgw_info["user"]["preferences"]["template_set"];
+      }elseif ($phpgw_info["server"]["template_set"] == "user_choice" || empty($phpgw_info["server"]["template_set"])){
+        $phpgw_info["server"]["template_set"] = "default";
+      }
 
       $tpldir = $phpgw_info["server"]["server_root"]."/".$appname."/templates/".$phpgw_info["server"]["template_set"];
       $tpldir_default = $phpgw_info["server"]["server_root"]."/".$appname."/templates/default";
diff --git a/phpgwapi/inc/phpgw_info.inc.php b/phpgwapi/inc/phpgw_info.inc.php
index 9b99158a7b..11286eeb2e 100644
--- a/phpgwapi/inc/phpgw_info.inc.php
+++ b/phpgwapi/inc/phpgw_info.inc.php
@@ -97,8 +97,8 @@
  
     $phpgw_info["server"]["app_root"]   = $phpgw->common->get_app_dir();
     $phpgw_info["server"]["app_inc"]    = $phpgw->common->get_inc_dir();
-    $phpgw_info["server"]["app_images"] = $phpgw->common->get_image_path();
     $phpgw_info["server"]["app_tpl"]    = $phpgw->common->get_tpl_dir();
+    $phpgw_info["server"]["app_images"] = $phpgw->common->get_image_path();
   
     /* ********This sets the user variables******** */
     $phpgw_info["user"]["private_dir"] = $phpgw_info["server"]["files_dir"] . "/users/"