diff --git a/admin.php b/admin.php
index e2d9f1796..287f05521 100644
--- a/admin.php
+++ b/admin.php
@@ -44,7 +44,7 @@ if (isset($_GET['plugins_new_order']))
 if (isset($_GET['change_theme']))
 {
   $admin_themes = array('roma', 'clear');
-  $admin_theme_array = array($conf['admin_theme']);
+  $admin_theme_array = array(userprefs_get_param('admin_theme', 'clear'));
   $result = array_diff(
       $admin_themes,
       $admin_theme_array
@@ -54,7 +54,7 @@ if (isset($_GET['change_theme']))
       $result
     );
 
-  conf_update_param('admin_theme', $new_admin_theme);
+  userprefs_update_param('admin_theme', $new_admin_theme);
 
   $url_params = array();
   foreach (array('page', 'tab', 'section') as $url_param)
diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php
index 4b10a5198..e3d421824 100644
--- a/admin/include/themes.class.php
+++ b/admin/include/themes.class.php
@@ -420,7 +420,7 @@ SELECT
             global $conf;
             $theme['screenshot'] =
               PHPWG_ROOT_PATH.'admin/themes/'
-              .$conf['admin_theme']
+              .userprefs_get_param('admin_theme', 'clear')
               .'/images/missing_screenshot.png'
               ;
           }
diff --git a/admin/themes_new.php b/admin/themes_new.php
index ad44e6cf6..b2ce12735 100644
--- a/admin/themes_new.php
+++ b/admin/themes_new.php
@@ -116,8 +116,8 @@ else
 }
 
 $template->assign('default_screenshot',
-  get_root_url().'admin/themes/'.$conf['admin_theme'].'/images/missing_screenshot.png'
+  get_root_url().'admin/themes/'.userprefs_get_param('admin_theme', 'clear').'/images/missing_screenshot.png'
 );
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'themes');
-?>
\ No newline at end of file
+?>
diff --git a/include/common.inc.php b/include/common.inc.php
index e0081529b..c2967d4c1 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -221,7 +221,7 @@ if (isset($page['auth_key_invalid']) and $page['auth_key_invalid'])
 // template instance
 if (defined('IN_ADMIN') and IN_ADMIN )
 {// Admin template
-  $template = new Template(PHPWG_ROOT_PATH.'admin/themes', $conf['admin_theme']);
+  $template = new Template(PHPWG_ROOT_PATH.'admin/themes', userprefs_get_param('admin_theme', 'clear'));
 }
 else
 { // Classic template