diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index c1bb78abdc..ec3552c8a5 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -799,9 +799,7 @@ if (!empty($action)) {
 
 // Create a search-box
 $form = new FormValidator('search_simple', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);
-$renderer = & $form->defaultRenderer();
-$renderer->setElementTemplate('<span>{element}</span> ');
-$form->addElement('text','keyword', get_lang('keyword'));
+$form->addElement('text', 'keyword', get_lang('keyword'));
 $form->addButtonSearch(get_lang('Search'));
 $form->addElement(
     'static',
diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php
index 280c02777e..ff131b85e5 100755
--- a/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/main/inc/lib/formvalidator/FormValidator.class.php
@@ -364,7 +364,7 @@ EOT;
         if (empty($label))  {
             $label = get_lang('Search');
         }
-        return $this->addButton('submit', $label, 'search');
+        return $this->addButton('submit', $label, 'search', 'default');
     }
 
     /**
diff --git a/main/inc/lib/pear/HTML/QuickForm/button.php b/main/inc/lib/pear/HTML/QuickForm/button.php
index 543df292a8..88de0be852 100755
--- a/main/inc/lib/pear/HTML/QuickForm/button.php
+++ b/main/inc/lib/pear/HTML/QuickForm/button.php
@@ -150,7 +150,7 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
      */
     public function setStyle($style)
     {
-        $style = !empty($style) ? 'btn-'.$style : null;
+        $style = !empty($style) ? 'btn btn-'.$style : null;
         $this->style = $style;
     }