diff --git a/install/sql/incremental/upd_0059.sql b/install/sql/incremental/upd_0059.sql
new file mode 100644
index 0000000000000000000000000000000000000000..247bb474cbbfcfe0a272a6b8c586293027765131
--- /dev/null
+++ b/install/sql/incremental/upd_0059.sql
@@ -0,0 +1 @@
+ALTER TABLE `client` CHANGE `company_id` `company_id` VARCHAR( 255 ) NULL DEFAULT NULL ;
\ No newline at end of file
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 24a0a98c475c24a9d5b80c1c936cfe1922e2d83b..565db7e2a664bf3bbb1f063406fd50bdc5466163 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -144,7 +144,7 @@ CREATE TABLE `client` (
   `sys_perm_group` varchar(5) DEFAULT NULL,
   `sys_perm_other` varchar(5) DEFAULT NULL,
   `company_name` varchar(64) DEFAULT NULL,
-  `company_id` varchar(30) DEFAULT NULL,
+  `company_id` varchar(255) DEFAULT NULL,
   `gender` enum('','m','f') NOT NULL DEFAULT '',
   `contact_name` varchar(64) DEFAULT NULL,
   `customer_no` varchar(64) DEFAULT NULL,
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 03624809510ccc2b82089258bd0b51d06025edec..37d51bdd8a17ee05fea2420a3f4854df946978fd 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -356,7 +356,7 @@ $form["tabs"]['address'] = array (
 			'value'		=> '',
 			'separator'	=> '',
 			'width'		=> '30',
-			'maxlength'	=> '20',
+			'maxlength'	=> '255',
 			'rows'		=> '',
 			'cols'		=> ''
 		),