diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index c9482efdb7..caa68885bd 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -645,9 +645,25 @@ class html
 		{
 			$skin = $GLOBALS['egw_info']['user']['preferences']['common']['rte_skin'];
 
-			//Check whether the skin actually exists
-			if (file_exists($basePath.'skins/'.$skin) || file_exists($skin))
-				$oCKeditor->config['skin'] = $skin;
+			//Convert old fckeditor skin names to new ones
+			switch ($skin)
+			{
+				case 'silver':
+					$skin = "v2";
+					break;
+				case 'default':
+					$skin = "kama";
+					break;
+				case 'office2003':
+					$skin = "office2003";
+					break;				
+			}
+
+			//Check whether the skin actually exists, if not, switch to a default
+			if (!(file_exists($basePath.'skins/'.$skin) || file_exists($skin)))
+				$skin = "office2003";
+
+			$oCKeditor->config['skin'] = $skin;
 		}
 
 		//$oCKeditor->config['spellchecker'] = 'SpellCheck';