diff --git a/trunk/module/company/config.php b/trunk/module/company/config.php
new file mode 100644
index 0000000000..e4eed9c887
--- /dev/null
+++ b/trunk/module/company/config.php
@@ -0,0 +1,3 @@
+<?php
+$config->company->create->requiredFields = 'name,pms';
+$config->company->edit->requiredFields   = 'name,pms';
diff --git a/trunk/module/company/model.php b/trunk/module/company/model.php
index 498e43a36e..310a61afb2 100644
--- a/trunk/module/company/model.php
+++ b/trunk/module/company/model.php
@@ -69,7 +69,7 @@ class companyModel extends model
         $this->dao->insert(TABLE_COMPANY)
             ->data($company)
             ->autoCheck()
-            ->batchCheck('name, pms', 'notempty')
+            ->batchCheck($this->config->company->create->requiredFields, 'notempty')
             ->batchCheck('name,pms', 'unique')
             ->exec();
     }
@@ -81,7 +81,7 @@ class companyModel extends model
         $this->dao->update(TABLE_COMPANY)
             ->data($company)
             ->autoCheck()
-            ->batchCheck('name, pms', 'notempty')
+            ->batchCheck($this->config->company->edit->requiredFields, 'notempty')
             ->batchCheck('name,pms', 'unique', "id != '$companyID'")
             ->where('id')->eq($companyID)
             ->exec();
diff --git a/trunk/module/company/view/create.html.php b/trunk/module/company/view/create.html.php
index 87bf983db5..0f2b95762b 100644
--- a/trunk/module/company/view/create.html.php
+++ b/trunk/module/company/view/create.html.php
@@ -29,35 +29,35 @@
       <caption><?php echo $lang->company->create;?></caption>
       <tr>
         <th class='rowhead'><?php echo $lang->company->name;?></th>
-        <td><input type='text' name='name' class='text-1' /></td>
+        <td><?php echo html::input('name', '', "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->phone;?></th>
-        <td><input type='text' name='phone' class='text-1' /></td>
+        <td><?php echo html::input('phone', '', "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->fax;?></th>
-        <td><input type='text' name='fax' class='text-1' /></td>
+        <td><?php echo html::input('fax', '', "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->address;?></th>
-        <td><input type='text' name='address' class='text-1' /></td>
+        <td><?php echo html::input('address', '', "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->zipcode;?></th>
-        <td><input type='text' name='zipcode' class='text-1' /></td>
+        <td><?php echo html::input('zipcode', '', "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->website;?></th>
-        <td><input type='text' name='website' class='text-1' /></td>
+        <td><?php echo html::input('website', '', "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->backyard;?></th>
-        <td><input type='text' name='backyard' class='text-1' /></td>
+        <td><?php echo html::input('backyard', '', "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->pms;?></th>
-        <td><input type='text' name='pms' class='text-1' /></td>
+        <td><?php echo html::input('pms', '', "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->guest;?></th>
diff --git a/trunk/module/company/view/edit.html.php b/trunk/module/company/view/edit.html.php
index 6beec9745b..33231f0bea 100644
--- a/trunk/module/company/view/edit.html.php
+++ b/trunk/module/company/view/edit.html.php
@@ -25,39 +25,39 @@
 <?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
-    <table align='center' class='table-5 a-left'> 
+    <table align='center' class='table-5'> 
       <caption><?php echo $lang->company->create;?></caption>
       <tr>
         <th class='rowhead'><?php echo $lang->company->name;?></th>
-        <td><input type='text' name='name' value='<?php echo $company->name;?>' class='text-1' /></td>
+        <td><?php echo html::input('name', $company->name, "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->phone;?></th>
-        <td><input type='text' name='phone' value='<?php echo $company->phone;?>' class='text-1' /></td>
+        <td><?php echo html::input('phone', $company->phone, "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->fax;?></th>
-        <td><input type='text' name='fax' value='<?php echo $company->fax;?>' class='text-1' /></td>
+        <td><?php echo html::input('fax', $company->fax, "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->address;?></th>
-        <td><input type='text' name='address' value='<?php echo $company->address;?>' class='text-1' /></td>
+        <td><?php echo html::input('address', $company->address, "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->zipcode;?></th>
-        <td><input type='text' name='zipcode' value='<?php echo $company->zipcode;?>' class='text-1' /></td>
+        <td><?php echo html::input('zipcode', $company->zipcode, "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->website;?></th>
-        <td><input type='text' name='website' value='<?php echo $company->website;?>' class='text-1' /></td>
+        <td><?php echo html::input('website', $company->website, "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->backyard;?></th>
-        <td><input type='text' name='backyard' value='<?php echo $company->backyard;?>' class='text-1' /></td>
+        <td><?php echo html::input('backyard', $company->backyard, "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->pms;?></th>
-        <td><input type='text' name='pms' value='<?php echo $company->pms;?>' class='text-1' /></td>
+        <td><?php echo html::input('pms', $company->pms, "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->company->guest;?></th>