diff --git a/customer_domains.php b/customer_domains.php
index 6028311c..6d115bb9 100644
--- a/customer_domains.php
+++ b/customer_domains.php
@@ -368,9 +368,9 @@ elseif($page == 'domains')
 					$aliasdomains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['id']);
 				}
 
+				$redirectcode = '';
 				if($settings['customredirect']['enabled'] == '1')
 				{
-					$redirectcode = '';
 					$codes = getRedirectCodesArray();
 					foreach($codes as $rc)
 					{
@@ -552,10 +552,10 @@ elseif($page == 'domains')
 					$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $result['documentroot']);
 				}
 
+				$redirectcode = '';
 				if($settings['customredirect']['enabled'] == '1')
 				{
 					$def_code = getDomainRedirectId($id);
-					$redirectcode = '';
 					$codes = getRedirectCodesArray();
 					foreach($codes as $rc)
 					{
diff --git a/lib/classes/output/class.htmlform.php b/lib/classes/output/class.htmlform.php
index 53733e81..9a09b294 100644
--- a/lib/classes/output/class.htmlform.php
+++ b/lib/classes/output/class.htmlform.php
@@ -27,6 +27,7 @@ class htmlform
 	public static function genHTMLForm($data = array())
 	{
 		global $lng;
+		$nob = false;
 
 		self::$_form = '';
 
@@ -47,7 +48,11 @@ class htmlform
 					continue;
 				}
 	
-				eval("self::\$_form .= \"" . getTemplate("misc/form/table_section", "1") . "\";");
+				if (!isset($section['nobuttons']) || $section['nobuttons'] == false) {
+					eval("self::\$_form .= \"" . getTemplate("misc/form/table_section", "1") . "\";");
+				} else {
+					$nob = true;
+				}
 
 				$nexto = false;
 				foreach($section['fields'] as $fieldname => $fielddata)
@@ -89,7 +94,9 @@ class htmlform
 		}
 
 		// add save/reset buttons at the end of the form
-		eval("self::\$_form .= \"" . getTemplate("misc/form/table_end", "1") . "\";");
+		if (!$nob) {
+			eval("self::\$_form .= \"" . getTemplate("misc/form/table_end", "1") . "\";");
+		}
 
 		return self::$_form;
 	}
diff --git a/lib/classes/ticket/class.ticket.php b/lib/classes/ticket/class.ticket.php
index 6103c308..d3415fea 100644
--- a/lib/classes/ticket/class.ticket.php
+++ b/lib/classes/ticket/class.ticket.php
@@ -453,7 +453,7 @@ class ticket
 	{
 		$sql = "SELECT MAX(`logicalorder`) as `highestorder` FROM `" . TABLE_PANEL_TICKET_CATS . "`;";
 		$result = $_db->query_first($sql);
-		return (isset($result['highestorder']) ? (int)$result['highestorder'] : 1);
+		return (isset($result['highestorder']) ? (int)$result['highestorder'] : 0);
 	}
 
 	/**
diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php
index 135b30d9..96a405e1 100644
--- a/lib/formfields/customer/domains/formfield.domains_add.php
+++ b/lib/formfields/customer/domains/formfield.domains_add.php
@@ -26,7 +26,8 @@ return array(
 				'fields' => array(
 					'subdomain' => array(
 						'label' => $lng['domains']['domainname'],
-						'type' => 'text',
+						'type' => 'textul',
+						'ul_field' => '',
 						'has_nextto' => true
 					),
 					'domain' => array(
diff --git a/lib/formfields/customer/email/formfield.emails_add.php b/lib/formfields/customer/email/formfield.emails_add.php
index 401e074f..aa3c1cc5 100644
--- a/lib/formfields/customer/email/formfield.emails_add.php
+++ b/lib/formfields/customer/email/formfield.emails_add.php
@@ -26,7 +26,8 @@ return array(
 				'fields' => array(
 					'email_part' => array(
 						'label' => $lng['emails']['emailaddress'],
-						'type' => 'text',
+						'type' => 'textul',
+						'ul_field' => '',
 						'has_nextto' => true
 					),
 					'domain' => array(
diff --git a/lib/formfields/customer/email/formfield.emails_edit.php b/lib/formfields/customer/email/formfield.emails_edit.php
index 9a45d847..1502e02a 100644
--- a/lib/formfields/customer/email/formfield.emails_edit.php
+++ b/lib/formfields/customer/email/formfield.emails_edit.php
@@ -23,6 +23,7 @@ return array(
 			'section_a' => array(
 				'title' => $lng['emails']['emails_edit'],
 				'image' => 'icons/email_edit.png',
+				'nobuttons' => true,
 				'fields' => array(
 					'email_full' => array(
 						'label' => $lng['emails']['emailaddress'],
diff --git a/templates/Classic/admin/ticket/tickets_editcategory.tpl b/templates/Classic/admin/ticket/tickets_editcategory.tpl
index c206e94e..4214317f 100644
--- a/templates/Classic/admin/ticket/tickets_editcategory.tpl
+++ b/templates/Classic/admin/ticket/tickets_editcategory.tpl
@@ -1,9 +1,10 @@
 $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" />
+		<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" />
+		<input type="hidden" name="send" value="send" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
 			<tr>
 				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
diff --git a/templates/Classic/admin/ticket/tickets_new.tpl b/templates/Classic/admin/ticket/tickets_new.tpl
index 41d15d17..284203e2 100644
--- a/templates/Classic/admin/ticket/tickets_new.tpl
+++ b/templates/Classic/admin/ticket/tickets_new.tpl
@@ -3,6 +3,7 @@ $header
 		<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="send" value="send" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
 			<tr>
 				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
diff --git a/templates/Classic/admin/ticket/tickets_newcategory.tpl b/templates/Classic/admin/ticket/tickets_newcategory.tpl
index 42cb969c..a01e0b82 100644
--- a/templates/Classic/admin/ticket/tickets_newcategory.tpl
+++ b/templates/Classic/admin/ticket/tickets_newcategory.tpl
@@ -1,8 +1,9 @@
 $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="s" value="$s" />
+		<input type="hidden" name="page" value="$page" />
+		<input type="hidden" name="action" value="$action" />
+		<input type="hidden" name="send" value="send" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
 			<tr>
 				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
diff --git a/templates/Classic/admin/ticket/tickets_reply.tpl b/templates/Classic/admin/ticket/tickets_reply.tpl
index 13edda7f..9502a252 100644
--- a/templates/Classic/admin/ticket/tickets_reply.tpl
+++ b/templates/Classic/admin/ticket/tickets_reply.tpl
@@ -3,6 +3,7 @@ $header
 		<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="send" value="send" />
  		<input type="hidden" name="id" value="$id" />
 		<if 0 < $ticket_replies_count >
 		$ticket_replies
diff --git a/templates/Classic/customer/email/account_changepw.tpl b/templates/Classic/customer/email/account_changepw.tpl
index 4d189eae..532246dc 100644
--- a/templates/Classic/customer/email/account_changepw.tpl
+++ b/templates/Classic/customer/email/account_changepw.tpl
@@ -9,7 +9,7 @@ $header
 			<tr>
 				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
 			</tr>
-			{$account_changepw}
+			{$account_changepw_form}
 		</table>
 	</form>
 	<br />
diff --git a/templates/Classic/customer/email/emails_edit.tpl b/templates/Classic/customer/email/emails_edit.tpl
index c563a460..2ca190ad 100644
--- a/templates/Classic/customer/email/emails_edit.tpl
+++ b/templates/Classic/customer/email/emails_edit.tpl
@@ -1,15 +1,13 @@
 $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" />
-		<input type="hidden" name="send" value="send" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
 			<tr>
 				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="$title" />&nbsp;{$title}</b></td>
 			</tr>
 			{$email_edit_form}
+			<tr>
+				<td class="maintitle" colspan="2"><a href="$filename?page=email&amp;s=$s">Back to overview (@TODO lng)</a></td>
+			</tr>
 		</table>
 	</form>
 	<br />
diff --git a/templates/Froxlor/customer/email/emails_edit.tpl b/templates/Froxlor/customer/email/emails_edit.tpl
index 777043c8..d407de2e 100644
--- a/templates/Froxlor/customer/email/emails_edit.tpl
+++ b/templates/Froxlor/customer/email/emails_edit.tpl
@@ -15,15 +15,10 @@ $header
 
 				<table class="formtable">
 					{$email_edit_form}
+					<tr>
+						<td class="maintitle" colspan="2"><a href="$filename?page=emails&amp;s=$s">Back to overview (@TODO lng)</a></td>
+					</tr>
 				</table>
-
-				<p style="display: none;">
-					<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" />
-					<input type="hidden" name="send" value="send" />
-				</p>
 			</fieldset>
 		</form>