diff --git a/interface/web/mail/form/mail_domain_catchall.tform.php b/interface/web/mail/form/mail_domain_catchall.tform.php
index b2a40fe2588fc5a648a206b1489ae00846a043f5..b308ed6c9cebe31ca863b2ae2f7a6ff97f9d104b 100644
--- a/interface/web/mail/form/mail_domain_catchall.tform.php
+++ b/interface/web/mail/form/mail_domain_catchall.tform.php
@@ -90,13 +90,15 @@ $form["tabs"]['catchall'] = array (
 		),
 		'destination' => array (
 			'datatype'	=> 'VARCHAR',
-			'formtype'	=> 'SELECT',
+			'formtype'	=> 'TEXT',
 			'default'	=> '',
+			/*
 			'datasource'	=> array ( 	'type'			=> 'SQL',
 										'querystring' 	=> 'SELECT email FROM mail_user WHERE {AUTHSQL} ORDER BY email',
 										'keyfield'		=> 'email',
 										'valuefield'	=> 'email'
 									 ),
+			*/
 			'validators'	=> array ( 	0 => array (	'type'	=> 'ISEMAIL',
 														'errmsg'=> 'destination_error_isemail'),
 									),
diff --git a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
index 3ce4662d4bace21ca32ab2fc819be5b150379ddf..68ea670b559f89a613c1deb4438192968c36232b 100644
--- a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
@@ -1,10 +1,11 @@
 <?php
 $wb['domain_txt'] = 'Domain';
-$wb['destination_txt'] = 'Ziel';
+$wb['destination_txt'] = 'Ziel Email';
 $wb['active_txt'] = 'Aktiv';
 $wb['domain_error_unique'] = 'Es besteht bereits ein Catchall-Eintrag für diese Domain.';
 $wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
 $wb['domain_error_regex'] = 'Ungültiger Domainname oder ungültige Zeichen im Domainnamen.';
 $wb['limit_mailcatchall_txt'] = 'Die maximale Anzahl an Catchall-Einträgen für ihr Konto wurde erreicht.';
 $wb["source_txt"] = 'Quelle';
+$wb['destination_error_isemail'] = 'Das Ziel ist keine gültige Emailadresse.';
 ?>
diff --git a/interface/web/mail/lib/lang/en_mail_domain_catchall.lng b/interface/web/mail/lib/lang/en_mail_domain_catchall.lng
index c8348a9671ee005c96c05effa44d1539b951fe01..1f1726e54094dfe36f6979ee4b534abbc4105457 100644
--- a/interface/web/mail/lib/lang/en_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/en_mail_domain_catchall.lng
@@ -1,6 +1,6 @@
 <?php
 $wb["domain_txt"] = 'Domain';
-$wb["destination_txt"] = 'Destination';
+$wb["destination_txt"] = 'Destination Email';
 $wb["active_txt"] = 'Active';
 $wb["domain_error_unique"] = "There is already a Catchall record for this domain.";
 $wb["no_domain_perm"] = "You have no permission for this domain.";
@@ -8,4 +8,5 @@ $wb["domain_error_regex"] = 'Invalid domain name od domain contains invalid char
 $wb["limit_mailcatchall_txt"] = 'The max. number of email catchall accounts for your account is reached.';
 $wb['domain_txt'] = 'Domain';
 $wb["source_txt"] = 'Source';
+$wb['destination_error_isemail'] = 'Destination is no valid email address.';
 ?>
diff --git a/interface/web/mail/templates/mail_domain_catchall_edit.htm b/interface/web/mail/templates/mail_domain_catchall_edit.htm
index 90b8af7b4476d5aaede228dab00b37d2caf1a550..d76dcfbce1f5eeda286231cfb22fa563e16ac14e 100644
--- a/interface/web/mail/templates/mail_domain_catchall_edit.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_edit.htm
@@ -14,9 +14,7 @@
       </div>
       <div class="ctrlHolder">
       	<label for="destination">{tmpl_var name='destination_txt'}</label>
-        <select name="destination" id="destination" class="selectInput">
-					{tmpl_var name='destination'}
-				</select>
+        <input name="destination" id="destination" value="{tmpl_var name='destination'}" size="30" maxlength="255" type="text" class="textInput" />
       </div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='active_txt'}</p>