diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 43d824bf639cfcb6b3cb68f0f7bd1a24d78ce97d..eb61dc9db885576350dc024808aae57548b39283 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -164,7 +164,7 @@ $form["tabs"]['address'] = array (
 		'usertheme' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'SELECT',
-			'default'	=> 'default',
+			'default'	=> $conf["theme"],
 			'value'		=> $themes_list,
 			'separator'	=> '',
 			'width'		=> '30',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index 86ccd4a24b8bedee017b3e22fbd1e85a0832efa8..715a892edade7cfb4b147db197049bc201d2bbc0 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -50,6 +50,17 @@ $form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update,
 $form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
 $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
 
+//* Load themes
+$themes_list = array();
+$handle = @opendir(ISPC_THEMES_PATH);
+while ($file = @readdir ($handle)) {
+    if (substr($file, 0, 1) != '.') {
+        if(@is_dir(ISPC_THEMES_PATH."/$file")) {
+            $themes_list[$file] = $file;
+        }
+    }
+}
+
 //* Languages
 $language_list = array();
 $handle = @opendir(ISPC_ROOT_PATH.'/lib/lang');
@@ -153,8 +164,8 @@ $form["tabs"]['address'] = array (
 		'usertheme' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'SELECT',
-			'default'	=> 'default',
-			'value'		=> array('default' => 'default'),
+			'default'	=> $conf["theme"],
+			'value'		=> $themes_list,
 			'separator'	=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255',