diff --git a/api/src/Etemplate/Widget/Nextmatch/Accountfilter.php b/api/src/Etemplate/Widget/Nextmatch/Accountfilter.php
index ba3ec352d4..dffa781d02 100644
--- a/api/src/Etemplate/Widget/Nextmatch/Accountfilter.php
+++ b/api/src/Etemplate/Widget/Nextmatch/Accountfilter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * EGroupware - eTemplate serverside implementation of the nextmatch filter header widget
+ * EGroupware - eTemplate serverside implementation of the nextmatch account filter header widget
  *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package api
@@ -18,7 +18,7 @@ use EGroupware\Api\Etemplate\Widget;
 /**
  * Extend selectbox and change type so proper users / groups get loaded, according to preferences
  */
-class AccountFilter extends Widget\Select
+class Accountfilter extends Widget\Select
 {
 	/**
 	 * Parse and set extra attributes from xml in template object
@@ -32,4 +32,5 @@ class AccountFilter extends Widget\Select
 
 		$this->attrs['type'] = 'select-account';
 	}
-}
\ No newline at end of file
+}
+Customfilter::registerWidget(__NAMESPACE__.'\\Accountfilter', array('nextmatch-accountfilter'));
\ No newline at end of file
diff --git a/api/src/Etemplate/Widget/Nextmatch/Customfilter.php b/api/src/Etemplate/Widget/Nextmatch/Customfilter.php
index 1a5c32c5f7..15c552cffb 100644
--- a/api/src/Etemplate/Widget/Nextmatch/Customfilter.php
+++ b/api/src/Etemplate/Widget/Nextmatch/Customfilter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * EGroupware - eTemplate serverside implementation of the nextmatch filter header widget
+ * EGroupware - eTemplate serverside implementation of the nextmatch custom filter header widget
  *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package api
@@ -18,7 +18,7 @@ use EGroupware\Api\Etemplate\Widget;
 /**
  * A filter widget that fakes another (select) widget and turns it into a nextmatch filter widget.
  */
-class NextmatchCustomFilter extends Widget\Transformer
+class Customfilter extends Widget\Transformer
 {
 
 	protected $legacy_options = 'type,widget_options';
@@ -40,7 +40,7 @@ class NextmatchCustomFilter extends Widget\Transformer
 				list($type) = explode('-',$this->attrs['type']);
 				if($type == 'select')
 				{
-					if(in_array($this->attrs['type'], Select::$cached_types))
+					if(in_array($this->attrs['type'], Widget\Select::$cached_types))
 					{
 						$widget_type = $this->attrs['type'];
 					}
@@ -60,3 +60,4 @@ class NextmatchCustomFilter extends Widget\Transformer
 		parent::beforeSendToClient($cname, $expand);
 	}
 }
+Customfilter::registerWidget(__NAMESPACE__.'\\Customfilter', array('nextmatch-customfilter'));
\ No newline at end of file
diff --git a/api/src/Etemplate/Widget/Nextmatch/Filterheader.php b/api/src/Etemplate/Widget/Nextmatch/Filterheader.php
index 0d9c5a8b3b..8ac44251e1 100644
--- a/api/src/Etemplate/Widget/Nextmatch/Filterheader.php
+++ b/api/src/Etemplate/Widget/Nextmatch/Filterheader.php
@@ -20,4 +20,6 @@ use EGroupware\Api\Etemplate\Widget;
  */
 class Filterheader extends Widget\Select
 {
-}
\ No newline at end of file
+}
+
+Customfilter::registerWidget(__NAMESPACE__.'\\Filterheader', array('nextmatch-filterheader'));
\ No newline at end of file