diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index 542bce6fc1b4cd5d3c68ed6bf7ccced20a7f644b..c97e39d9fefa7db5134a71bbf106b20817e44166 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -281,7 +281,17 @@ class listform {
                         $record[$key] = htmlentities(stripslashes($record[$key]),ENT_QUOTES,$conf["html_content_encoding"]);
                          break;
 
-                    case 'DATE':
+                    case 'DATETSTAMP':
+                        if ($record[$key] > 0) {
+							// is value int?
+							if (ereg("^[0-9]+[.]?[0-9]*$", $record[$key], $p)) {
+	                        	$record[$key] = date($this->lng('conf_format_dateshort'), $record[$key]);
+							} else {
+	                        	$record[$key] = date($this->lng('conf_format_dateshort'), strtotime($record[$key]));
+							}
+						}
+                        break;
+					case 'DATE':
                         if ($record[$key] > 0) {
 							// is value int?
 							if (ereg("^[0-9]+[.]?[0-9]*$", $record[$key], $p)) {
@@ -340,11 +350,17 @@ class listform {
                         }
                         break;
                     
-                    case 'DATE':
+					case 'DATETSTAMP':
                         if($record[$key] > 0) {
 						    $record[$key] = date('Y-m-d',strtotime($record[$key]));
                         }
                         break;
+					
+                    case 'DATE':
+                        if($record[$key] != '' && $record[$key] != '0000-00-00') {
+						    $record[$key] = $record[$key];
+                        }
+                        break;
 
                     case 'DATETIME':
                         if($record[$key] > 0) {
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 9c2ec9c3bb3159112efd8d3de680831177bafae2..97150d43a207fc7c9229c2d9ef4af71a7727c410 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -176,11 +176,18 @@ class tform {
                                         $new_record[$key] = $record[$key];
                                 break;
 
-                                case 'DATE':
+                                case 'DATETSTAMP':
                                         if($record[$key] > 0) {
                                                 $new_record[$key] = date($this->dateformat,$record[$key]);
                                         }
                                 break;
+								
+								case 'DATE':
+                                        if($record[$key] != '' && $record[$key] != '0000-00-00') {
+												$tmp = explode('-',$record[$key]);
+                                                $new_record[$key] = date($this->dateformat,mktime(0, 0, 0, $tmp[1]  , $tmp[2], $tmp[0]));
+                                        }
+                                break;
 
                                 case 'INTEGER':
                                         $new_record[$key] = intval($record[$key]);
@@ -596,13 +603,23 @@ class tform {
                                                 $new_record[$key] = implode($field['separator'],$record[$key]);
                                         }
                                 break;
-                                case 'DATE':
+                                case 'DATETSTAMP':
                                         if($record[$key] > 0) {
                                                 list($tag,$monat,$jahr) = explode('.',$record[$key]);
                                                 $new_record[$key] = mktime(0,0,0,$monat,$tag,$jahr);
                                         } else {
 											$new_record[$key] = 0;
 										}
+                                break;
+								case 'DATE':
+                                        if($record[$key] != '' && $record[$key] != '0000-00-00') {
+                                                list($tag,$monat,$jahr) = explode('.',$record[$key]);
+                                                $new_record[$key] = $jahr.'-'.$monat.'-'.$tag;
+												//$tmp = strptime($record[$key],$this->dateformat);
+												//$new_record[$key] = ($tmp['tm_year']+1900).'-'.($tmp['tm_mon']+1).'-'.$tmp['tm_mday'];
+                                        } else {
+											$new_record[$key] = '0000-00-00';
+										}
                                 break;
                                 case 'INTEGER':
                                         $new_record[$key] = (isset($record[$key]))?$record[$key]:0;
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index da7aceccbf54f12fa64a66fae46ea8af64eb7857..e9882f559cb0f40c0a51bd028abccc5aef8f64f0 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -31,4 +31,5 @@ $wb['top_menu_sites'] = 'Sites';
 $wb['top_menu_dns'] = 'DNS';
 $wb['top_menu_tools'] = 'Tools';
 $wb['top_menu_help'] = 'Support';
+$wb['top_menu_billing'] = 'Billing';
 ?>
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index fd6f4a3e33eec2961b4101c85367415056f15757..be14f7de91ca17fb11cea421f9f311a80cd10c6a 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -31,5 +31,6 @@ $wb['top_menu_sites'] = 'Sites';
 $wb['top_menu_dns'] = 'DNS';
 $wb['top_menu_tools'] = 'Tools';
 $wb['top_menu_help'] = 'Help';
+$wb['top_menu_billing'] = 'Billing';
 $wb['toolsarea_head_txt'] = 'Tools';
 ?>