diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 35d7d09103284f4634f742b97b22c31d1f145025..eab4e022e16ee4944c0f4ec69e0fe6ae2e145eca 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -381,7 +381,12 @@ $form["tabs"]['address'] = array (
 					'class' => 'validate_client',
 					'function' => 'check_vat_id',
 					'errmsg'=> 'invalid_vat_id'),
-				),
+			),
+			'filters'   => array( 0 => array( 	'event' => 'SAVE',
+												'type' => 'TRIM'),
+								1 => array( 	'event' => 'SAVE',
+												'type' => 'TOUPPER')
+			),
 		),
 		'company_id' => array (
 			'datatype' => 'VARCHAR',
@@ -447,7 +452,12 @@ $form["tabs"]['address'] = array (
 			'width'  => '30',
 			'maxlength' => '255',
 			'rows'  => '',
-			'cols'  => ''
+			'cols'  => '',
+			'filters'   => array( 0 => array( 	'event' => 'SAVE',
+												'type' => 'TRIM'),
+								1 => array( 	'event' => 'SAVE',
+												'type' => 'TOUPPER')
+			),
 		),
 		'bank_account_swift' => array (
 			'datatype' => 'VARCHAR',
@@ -458,7 +468,12 @@ $form["tabs"]['address'] = array (
 			'width'  => '30',
 			'maxlength' => '255',
 			'rows'  => '',
-			'cols'  => ''
+			'cols'  => '',
+			'filters'   => array( 0 => array( 	'event' => 'SAVE',
+												'type' => 'TRIM'),
+								1 => array( 	'event' => 'SAVE',
+												'type' => 'TOUPPER')
+			),
 		),
 		'notes' => array (
 			'datatype' => 'TEXT',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index 1b18f3d95447078d57d290816b331d6c3745a4a0..daba140b7e0fb41cd9f6e1a98552247bbc493cff 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -380,7 +380,12 @@ $form["tabs"]['address'] = array (
 					'class' => 'validate_client',
 					'function' => 'check_vat_id',
 					'errmsg'=> 'invalid_vat_id'),
-				),
+			),
+			'filters'   => array( 0 => array( 	'event' => 'SAVE',
+												'type' => 'TRIM'),
+								1 => array( 	'event' => 'SAVE',
+												'type' => 'TOUPPER')
+			),
 		),
 		'company_id' => array (
 			'datatype' => 'VARCHAR',
@@ -446,7 +451,12 @@ $form["tabs"]['address'] = array (
 			'width'  => '30',
 			'maxlength' => '255',
 			'rows'  => '',
-			'cols'  => ''
+			'cols'  => '',
+			'filters'   => array( 0 => array( 	'event' => 'SAVE',
+												'type' => 'TRIM'),
+								1 => array( 	'event' => 'SAVE',
+												'type' => 'TOUPPER')
+			),
 		),
 		'bank_account_swift' => array (
 			'datatype' => 'VARCHAR',
@@ -457,7 +467,12 @@ $form["tabs"]['address'] = array (
 			'width'  => '30',
 			'maxlength' => '255',
 			'rows'  => '',
-			'cols'  => ''
+			'cols'  => '',
+			'filters'   => array( 0 => array( 	'event' => 'SAVE',
+												'type' => 'TRIM'),
+								1 => array( 	'event' => 'SAVE',
+												'type' => 'TOUPPER')
+			),
 		),
 		'notes' => array (
 			'datatype' => 'TEXT',
diff --git a/interface/web/themes/default/templates/sidenav.tpl.htm b/interface/web/themes/default/templates/sidenav.tpl.htm
index b85100336026b611656d73f5630f6a3052cfddef..6064966cdb4a5995d072bf40406cc557305f3be9 100644
--- a/interface/web/themes/default/templates/sidenav.tpl.htm
+++ b/interface/web/themes/default/templates/sidenav.tpl.htm
@@ -1,5 +1,5 @@
 <tmpl_loop name="nav_left">
-	<header><tmpl_if name="startpage"><a href="#" class="subnav-header" data-load-content="<tmpl_var name='startpage'>"></tmpl_if><tmpl_var name="title"><tmpl_if name="startpage"></a></tmpl_if></header>
+	<tmpl_if name="title"><header><tmpl_if name="startpage"><a href="#" class="subnav-header" data-load-content="<tmpl_var name='startpage'>"></tmpl_if><tmpl_var name="title"><tmpl_if name="startpage"></a></tmpl_if></header></tmpl_if>
 	<ul id="sub-navigation">
 	  <tmpl_loop name="items">
 	  <li<tmpl_if name="html_id"> id='<tmpl_var name="html_id">' </tmpl_if>>