diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php
new file mode 100644
index 00000000..7d63ff7b
--- /dev/null
+++ b/lib/formfields/customer/domains/formfield.domains_add.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Formfields
+ * @version    $Id: formfield.domains_add.php 112 2010-12-14 12:11:20Z d00p $
+ */
+
+return array(
+	'domain_add' => array(
+		'title' => $lng['domains']['subdomain_add'],
+		'image' => 'icons/add_domain.png',
+		'sections' => array(
+			'section_a' => array(
+				'title' => $lng['domains']['subdomain_add'],
+				'image' => 'icons/add_domain.png',
+				'fields' => array(
+					'domain' => array(
+						'label' => $lng['domains']['domainname'],
+						'type' => 'text'
+					),
+					'aliasdomain' => array(
+						'label' => $lng['domains']['aliasdomain'],
+						'type' => 'select',
+						'select_var' => $aliasdomains
+					),
+					'pathedit' => array(
+						'visible' => ($settings['panel']['pathedit'] != 'Dropdown' ? true : false),
+						'label' => $lng['panel']['pathorurl'],
+						'desc' => $lng['panel']['pathDescription'], // TODO was ist mit: $lng['panel']['pathDescriptionEx'] ?
+						'type' => 'text',
+						'value' => $pathSelect
+					),
+					'pathedit_dropdown' => array(
+						'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
+						'label' => $lng['panel']['path'],
+						'type' => 'text',
+						'value' => $pathSelect
+					),
+					'pathedit_dropdown2' => array(
+						'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
+						'label' => $lng['panel']['urloverridespath'],
+						'type' => 'text',
+						'value' => $urlvalue,
+						'size' => 30
+					),
+					'apache2_customerRedirect' => array(
+						'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1') ? true : false),
+						'label' => $lng['domains']['redirectifpathisurl'],
+						'desc' => $lng['domains']['redirectifpathisurlinfo'],
+						'type' => 'select',
+						'select_var' => $redirectcode
+					),
+					'ssl' => array(
+						'visible' => ($settings['system']['use_ssl'] == '1' ? true : false),
+						'label' => 'SSL Redirect',
+						'type' => 'text',
+						'yesno_var' => $ssl_redirect
+					),
+					'openbasedir' => array(
+						'label' => $lng['domain']['openbasedirpath'],
+						'type' => 'select',
+						'select_var' => $openbasedir
+					)
+				)
+			)
+		)
+	)
+);
diff --git a/lib/formfields/customer/domains/formfield.domains_edit.php b/lib/formfields/customer/domains/formfield.domains_edit.php
new file mode 100644
index 00000000..e81eb8e8
--- /dev/null
+++ b/lib/formfields/customer/domains/formfield.domains_edit.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Formfields
+ * @version    $Id: formfield.domains_edit.php 130 2010-12-22 00:54:11Z d00p $
+ */
+
+return array(
+	'domain_edit' => array(
+		'title' => $lng['domains']['subdomain_edit'],
+		'image' => 'icons/domain_edit.png',
+		'sections' => array(
+			'section_a' => array(
+				'title' => $lng['domains']['subdomain_edit'],
+				'image' => 'icons/domain_edit.png',
+				'fields' => array(
+					'domain' => array(
+						'label' => $lng['domains']['domainname'],
+						'type' => 'label',
+						'value' => $result['domain']
+					),
+					'dns' => array(
+						'label' => $lng['dns']['destinationip'],
+						'type' => 'label',
+						'value' => $domainip
+					),
+					'alias_check' => array(
+						'visible' => ($alias_check == '0' ? true : false),
+						'label' => $lng['domains']['aliasdomain'],
+						'type' => 'select',
+						'select_var' => $domains
+					),
+					'pathedit' => array(
+						'visible' => ($settings['panel']['pathedit'] != 'Dropdown' ? true : false),
+						'label' => $lng['panel']['pathorurl'],
+						'desc' => $lng['panel']['pathDescription'], // TODO was ist mit: $lng['panel']['pathDescriptionEx'] ?
+						'type' => 'text',
+						'value' => $pathSelect
+					),
+					'pathedit_dropdown' => array(
+						'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
+						'label' => $lng['panel']['path'],
+						'type' => 'text',
+						'value' => $pathSelect
+					),
+					'pathedit_dropdown2' => array(
+						'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
+						'label' => $lng['panel']['urloverridespath'],
+						'type' => 'text',
+						'value' => $urlvalue,
+						'size' => 30
+					),
+					'apache2_customerRedirect' => array(
+						'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1') ? true : false),
+						'label' => $lng['domains']['redirectifpathisurl'],
+						'desc' => $lng['domains']['redirectifpathisurlinfo'],
+						'type' => 'select',
+						'select_var' => $redirectcode
+					),
+					'parentdomain' => array(
+						'visible' => (($result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0') ? true : false),
+						'label' => $lng['domains']['wildcarddomain'],
+						'type' => 'label',
+						'value' => $iswildcarddomain
+					),
+					'emaildomain' => array(
+						'visible' => ((( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0') ? true : false),
+						'label' => 'Emaildomain',
+						'type' => 'label',
+						'value' => $isemaildomain
+					),
+					'ssl' => array(
+						'visible' => ($settings['system']['use_ssl'] == '1' ? true : false),
+						'label' => 'SSL Redirect',
+						'type' => 'label',
+						'value' => $ssl_redirect
+					),
+					'openbasedir' => array(
+						'label' => $lng['domain']['openbasedirpath'],
+						'type' => 'select',
+						'select_var' => $openbasedir
+					)
+				)
+			)
+		)
+	)
+);