diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php
index d333bb07..135b30d9 100644
--- a/lib/formfields/customer/domains/formfield.domains_add.php
+++ b/lib/formfields/customer/domains/formfield.domains_add.php
@@ -44,7 +44,8 @@ return array(
 						'label' => $lng['panel']['path'],
 						'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
 						'type' => $pathSelect['type'],
-						'select_var' => $pathSelect['value']
+						'select_var' => $pathSelect['value'],
+						'value' => $pathSelect['value']
 					),
 					'url' => array(
 						'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
diff --git a/lib/formfields/customer/domains/formfield.domains_edit.php b/lib/formfields/customer/domains/formfield.domains_edit.php
index 2741e5f3..ba551e8d 100644
--- a/lib/formfields/customer/domains/formfield.domains_edit.php
+++ b/lib/formfields/customer/domains/formfield.domains_edit.php
@@ -44,7 +44,8 @@ return array(
 						'label' => $lng['panel']['path'],
 						'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
 						'type' => $pathSelect['type'],
-						'select_var' => $pathSelect['value']
+						'select_var' => $pathSelect['value'],
+						'value' => $pathSelect['value']
 					),
 					'url' => array(
 						'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
diff --git a/lib/functions/filedir/function.makePathfield.php b/lib/functions/filedir/function.makePathfield.php
index 1d5098b3..912a47b4 100644
--- a/lib/functions/filedir/function.makePathfield.php
+++ b/lib/functions/filedir/function.makePathfield.php
@@ -38,6 +38,12 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '')
 	$value = str_replace($path, '', $value);
 	$field = array();
 
+	// path is given without starting slash
+	// but dirList holds the paths with starting slash
+	// so we just add one here to get the correct
+	// default path selected, #225
+	$value = '/'.$value;
+
 	if($fieldType == 'Manual')
 	{
 		$field = array(
@@ -48,12 +54,6 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '')
 	}
 	elseif($fieldType == 'Dropdown')
 	{
-		// path is given without starting slash
-		// but dirList holds the paths with starting slash
-		// so we just add one here to get the correct
-		// default path selected, #225
-		$value = '/'.$value;
-
 		$dirList = findDirs($path, $uid, $gid);
 		
 		natcasesort($dirList);
@@ -93,7 +93,7 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '')
 		else
 		{
 			//$field = $lng['panel']['dirsmissing'];
-			$field = '<input type="hidden" name="path" value="/" />';
+			//$field = '<input type="hidden" name="path" value="/" />';
 			$field = array(
 				'type' => 'hidden',
 				'value' => '/',
diff --git a/templates/Classic/customer/domains/domains_add.tpl b/templates/Classic/customer/domains/domains_add.tpl
index d9862601..ff9c2a24 100644
--- a/templates/Classic/customer/domains/domains_add.tpl
+++ b/templates/Classic/customer/domains/domains_add.tpl
@@ -3,55 +3,13 @@ $header
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
+		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
 			<tr>
-				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['domains']['subdomain_add']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['domains']['domainname']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" name="subdomain" value="" size="15" maxlength="50" /> <b>.</b> <select class="tendina_nobordo" name="domain">$domains</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['domains']['aliasdomain']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><select name="alias">$aliasdomains</select></td>
-			</tr>
-			<if $settings['panel']['pathedit'] != 'Dropdown'>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}</font></td>
-					<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
-				</tr>
-			</if>
-			<if $settings['panel']['pathedit'] == 'Dropdown'>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['path']}:</td>
-					<td class="main_field_display">{$pathSelect}</td>
-				</tr>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['urloverridespath']}:</td>
-					<td class="main_field_display"><input type="text" class="text" name="url" value="" size="30" /></td>
-				</tr>
-			</if>
-			<if $settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1'>
-				<tr>
-					<td class="main_field_name">{$lng['domains']['redirectifpathisurl']}:<br /><font size="1">{$lng['domains']['redirectifpathisurlinfo']}</font></td>
-					<td class="main_field_display" nowrap="nowrap"><select name="redirectcode">$redirectcode</select></td>
-				</tr>
-			</if>
-			<if $settings['system']['use_ssl'] == '1'>
-                        <tr>
-                                <td class="main_field_name">SSL Redirect:</td>
-                                <td class="main_field_display" nowrap="nowrap">$ssl_redirect</td>
-                        </tr>
-			</if>
-			<tr>
-				<td class="main_field_name">{$lng['domain']['openbasedirpath']}:</td>
-				<td class="main_field_display" nowrap><select name="openbasedir_path">$openbasedir</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['domains']['subdomain_add']}" /></td>
+				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="$title" />&nbsp;{$title}</b></td>
 			</tr>
+			{$subdomain_add_form}
 		</table>
 	</form>
 	<br />
 	<br />
-$footer
\ No newline at end of file
+$footer
diff --git a/templates/Classic/customer/domains/domains_edit.tpl b/templates/Classic/customer/domains/domains_edit.tpl
index 526808c6..456e6519 100644
--- a/templates/Classic/customer/domains/domains_edit.tpl
+++ b/templates/Classic/customer/domains/domains_edit.tpl
@@ -2,75 +2,16 @@ $header
 	<form method="post" action="$filename">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
-		<input type="hidden" name="action" value="$action" />
 		<input type="hidden" name="id" value="$id" />
-		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
+		<input type="hidden" name="action" value="$action" />
+		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
 			<tr>
-				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['domains']['subdomain_edit']}</b></td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['domains']['domainname']}:</td>
-				<td class="main_field_display" nowrap="nowrap">{$result['domain']}</td>
-			</tr>
-			<tr>
-				<td class="main_field_name">{$lng['dns']['destinationip']}:</td>
-				<td class="main_field_display" nowrap="nowrap">{$domainip}</td>
-			</tr>
-			<if $alias_check == '0'>
-				<tr>
-					<td class="main_field_name">{$lng['domains']['aliasdomain']}:</td>
-					<td class="main_field_display" nowrap="nowrap"><select class="tendina_nobordo" name="alias">$domains</select></td>
-				</tr>
-			</if>
-			<if $settings['panel']['pathedit'] != 'Dropdown'>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}</font></td>
-					<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
-				</tr>
-			</if>
-			<if $settings['panel']['pathedit'] == 'Dropdown'>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['path']}:</td>
-					<td class="main_field_display">{$pathSelect}</td>
-				</tr>
-				<tr>
-					<td class="main_field_name">{$lng['panel']['urloverridespath']}:</td>
-					<td class="main_field_display"><input type="text" class="text" name="url" value="{$urlvalue}" size="30" /></td>
-				</tr>
-			</if>
-			<if $settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1'>
-				<tr>
-					<td class="main_field_name">{$lng['domains']['redirectifpathisurl']}:<br /><font size="1">{$lng['domains']['redirectifpathisurlinfo']}</font></td>
-					<td class="main_field_display" nowrap="nowrap"><select name="redirectcode">$redirectcode</select></td>
-				</tr>
-			</if>
-			<if $result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0' >
-				<tr>
-					<td class="main_field_name">{$lng['domains']['wildcarddomain']}</td>
-					<td class="main_field_display" nowrap="nowrap">$iswildcarddomain</td>
-				</tr>
-			</if>
-			<if ( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0' >
-				<tr>
-					<td class="main_field_name">Emaildomain:</td>
-					<td class="main_field_display" nowrap="nowrap">$isemaildomain</td>
-				</tr>
-			</if>
-			<if $settings['system']['use_ssl'] == '1'>
-				<tr>
-					<td class="main_field_name">SSL Redirect:</td>
-					<td class="main_field_display" nowrap="nowrap">$ssl_redirect</td>
-				</tr>
-			</if>
-			<tr>
-				<td class="main_field_name">{$lng['domain']['openbasedirpath']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><select name="openbasedir_path">$openbasedir</select></td>
-			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['panel']['save']}" /></td>
+				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="$title" />&nbsp;{$title}</b></td>
 			</tr>
+			{$subdomain_edit_form}
 		</table>
 	</form>
 	<br />
 	<br />
 $footer
+