diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index a7fc034a8..ae4abb603 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -551,7 +551,7 @@ class e_form
 			$prefix = '  '.str_repeat('--', $nest_level - 1).'>';
 			$style = '';
 		}
-		return $this->option($prefix.$this->_uc->uc_get_classname($classnum), $classnum, in_array($classnum, $tmp), array("style"=>"{$style}"))."\n";
+		return $this->option($prefix.$this->_uc->uc_get_classname($classnum), $classnum, ($current_value !== '' && in_array($classnum, $tmp)), array("style"=>"{$style}"))."\n";
 	}
 
 	function optgroup_open($label, $disabled = false)