diff --git a/install/sql/incremental/upd_0005.sql b/install/sql/incremental/upd_0005.sql
new file mode 100644
index 0000000000000000000000000000000000000000..6694ed9c6f9a7bf0dd04a30eaec6679230a005c7
--- /dev/null
+++ b/install/sql/incremental/upd_0005.sql
@@ -0,0 +1,2 @@
+ALTER TABLE client ADD COLUMN company_id varchar(30);
+
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 2361d9db7d5799aacada02474ce2ed90d90b695d..8dbd915f221fc714dbeecec27a6b7a04615313ad 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1649,6 +1649,8 @@ CREATE TABLE `help_faq` (
 
 INSERT INTO `help_faq` VALUES (1,1,0,'I\'d like to know ...','Yes, of course.',1,1,'riud','riud','r');
 
+ALTER TABLE client ADD COLUMN company_id varchar(30);
+
 -- --------------------------------------------------------
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index f4777ae5391bf4c1cf074e04f6f9c0d3a687b63c..2b832aaa7ee1203054a2c61dfed0e52afb6e234a 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -305,6 +305,17 @@ $form["tabs"]['address'] = array (
 			'rows'		=> '',
 			'cols'		=> ''
 		),
+		'company_id' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'value'		=> '',
+			'separator'	=> '',
+			'width'		=> '30',
+			'maxlength'	=> '20',
+			'rows'		=> '',
+			'cols'		=> ''
+		),
 		'notes' => array (
 			'datatype'	=> 'TEXT',
 			'formtype'	=> 'TEXTAREA',
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index 9c5164328e02d1dbe19ef6e5424304ed31acd642..145d8680c153b05aeeb1e8d3270f2a4e53aa98b6 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -98,4 +98,5 @@ $wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.
 $wb['customer_no_txt'] = 'Customer No.';
 $wb['vat_id_txt'] = 'VAT ID';
 $wb['required_fields_txt'] = '* Required fields';
+$wb['company_id_txt'] = 'IÄŒO';
 ?>
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index aa8578048b5b2dc57f8d7b912a0bdb8c4727c346..656968c420c64bd7c825327bfd45024d73d96571 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -101,4 +101,5 @@ $wb["limit_trafficquota_error_notint"] = 'Traffic Quota must be a number.';
 $wb["customer_no_txt"] = 'Customer No.';
 $wb["vat_id_txt"] = 'VAT ID';
 $wb["required_fields_txt"] = '* Required fields';
+$wb['company_id_txt'] = 'Company/Entrepreneur ID';
 ?>
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index 485d0f121f0e4bca81432a2c0e02bdc25ae80e33..520c3fa32c7c4f31bfbaa5cb8aa5425edfd14010 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -92,6 +92,10 @@
       	<label for="vat_id">{tmpl_var name='vat_id_txt'}</label>
         <input name="vat_id" id="vat_id" value="{tmpl_var name='vat_id'}" size="30" maxlength="255" type="text" class="textInput" />
 	  </div>
+	  <div class="ctrlHolder">
+      	<label for="company_id">{tmpl_var name='company_id_txt'}</label>
+        <input name="company_id" id="company_id" value="{tmpl_var name='company_id'}" size="30" maxlength="255" type="text" class="textInput" />
+	  </div>
       <div class="ctrlHolder">
       	<label for="notes">{tmpl_var name='notes_txt'}</label>
         <textarea name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea>