diff --git a/app/controllers/admin/AccessoriesController.php b/app/controllers/admin/AccessoriesController.php
index 249b3bd49a..5146b6fbe3 100755
--- a/app/controllers/admin/AccessoriesController.php
+++ b/app/controllers/admin/AccessoriesController.php
@@ -42,7 +42,7 @@ class AccessoriesController extends AdminController
     {
         // Show the page
         $category_list = array('' => '') + DB::table('categories')->where('category_type','=','accessory')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
-        $company_list = Company::getSelectList();
+        $company_list = companyList();
         $location_list = locationsList();
         return View::make('backend/accessories/edit')
             ->with('accessory', new Accessory)
@@ -125,7 +125,7 @@ class AccessoriesController extends AdminController
         }
 
 		    $category_list = array('' => '') + DB::table('categories')->where('category_type','=','accessory')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
-        $company_list = Company::getSelectList();
+        $company_list = companyList();
         $location_list = locationsList();
 
         return View::make('backend/accessories/edit', compact('accessory'))
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 93ac260e3a..62895b483d 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -68,7 +68,7 @@ class AssetsController extends AdminController
         $manufacturer_list = manufacturerList();
         $category_list = categoryList();
         $supplier_list = suppliersList();
-        $company_list = Company::getSelectList();
+        $company_list = companyList();
         $assigned_to = usersList();
         $statuslabel_types = statusTypeList();
 
@@ -253,7 +253,7 @@ class AssetsController extends AdminController
         $manufacturer_list = manufacturerList();
         $category_list = categoryList();
         $supplier_list = suppliersList();
-        $company_list = Company::getSelectList();
+        $company_list = companyList();
         $assigned_to = usersList();
         $statuslabel_types = statusTypeList();
 
@@ -883,7 +883,7 @@ class AssetsController extends AdminController
         $supplier_list = suppliersList();
         $assigned_to = usersList();
         $statuslabel_types = statusTypeList();
-        $company_list = Company::getSelectList();
+        $company_list = companyList();
 
         $asset = clone $asset_to_clone;
         $asset->id = null;
diff --git a/app/controllers/admin/ConsumablesController.php b/app/controllers/admin/ConsumablesController.php
index b0ddb1dc1a..d5c8011c56 100644
--- a/app/controllers/admin/ConsumablesController.php
+++ b/app/controllers/admin/ConsumablesController.php
@@ -42,7 +42,7 @@ class ConsumablesController extends AdminController
     {
         // Show the page
         $category_list = array('' => '') + DB::table('categories')->where('category_type','=','consumable')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
-        $company_list = Company::getSelectList();
+        $company_list = companyList();
         $location_list = locationsList();
 
         return View::make('backend/consumables/edit')
@@ -126,7 +126,7 @@ class ConsumablesController extends AdminController
         }
 
 		$category_list = array('' => '') + DB::table('categories')->where('category_type','=','consumable')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
-        $company_list = Company::getSelectList();
+        $company_list = companyList();
         $location_list = locationsList();
 
         return View::make('backend/consumables/edit', compact('consumable'))
diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php
index 11a8858b7c..02b13b212b 100755
--- a/app/controllers/admin/LicensesController.php
+++ b/app/controllers/admin/LicensesController.php
@@ -56,7 +56,7 @@ class LicensesController extends AdminController
         $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
         $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
         $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
-        $company_list = Company::getSelectList();
+        $company_list = companyList();
 
         return View::make('backend/licenses/edit')
             ->with('license_options',$license_options)
@@ -203,7 +203,7 @@ class LicensesController extends AdminController
         $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
         $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
         $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
-        $company_list = Company::getSelectList();
+        $company_list = companyList();
 
         return View::make('backend/licenses/edit', compact('license'))
             ->with('license_options',$license_options)
@@ -782,7 +782,7 @@ class LicensesController extends AdminController
           // Show the page
         $license_options = array('0' => 'Top Level') + License::lists('name', 'id');
 		    $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
-        $company_list = Company::getSelectList();
+        $company_list = companyList();
         //clone the orig
         $license = clone $license_to_clone;
         $license->id = null;
diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index 2e23ee7623..f8a0e6733c 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -86,7 +86,7 @@ class UsersController extends AdminController {
 
         $location_list = locationsList();
         $manager_list = managerList();
-        $company_list = Company::getSelectList();
+        $company_list = companyList();
 
         /* echo '<pre>';
           print_r($userPermissions);
@@ -285,7 +285,7 @@ class UsersController extends AdminController {
             $this->encodeAllPermissions($permissions);
 
             $location_list = locationsList();
-            $company_list = Company::getSelectList();
+            $company_list = companyList();
             $manager_list = array('' => 'Select a User') + DB::table('users')
                             ->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))
                             ->whereNull('deleted_at')
@@ -737,7 +737,7 @@ class UsersController extends AdminController {
             $this->encodeAllPermissions($permissions);
 
             $location_list = array('' => '') + Location::lists('name', 'id');
-            $company_list = Company::getSelectList();
+            $company_list = companyList();
             $manager_list = array('' => 'Select a User') + DB::table('users')
                             ->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))
                             ->whereNull('deleted_at')
diff --git a/app/helpers.php b/app/helpers.php
index b613292815..6f4b88a3fc 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -27,7 +27,7 @@ function modelList() {
 }
 
 function companyList() {
-    $company_list = array('' => '') + DB::table('companies')
+   $company_list = array('0' => Lang::get('general.select_company')) + DB::table('companies')
     ->orderBy('name', 'asc')
     ->lists('name', 'id');
     return $company_list;
diff --git a/app/lang/en/admin/companies/general.php b/app/lang/en/admin/companies/general.php
new file mode 100644
index 0000000000..9d58ccb58e
--- /dev/null
+++ b/app/lang/en/admin/companies/general.php
@@ -0,0 +1,4 @@
+<?php
+return [
+    'select_company' => 'Select Company',
+];
diff --git a/app/lang/en/admin/companies/message.php b/app/lang/en/admin/companies/message.php
new file mode 100644
index 0000000000..a6db573519
--- /dev/null
+++ b/app/lang/en/admin/companies/message.php
@@ -0,0 +1,18 @@
+<?php
+return array(
+    'does_not_exist' => 'Company does not exist.',
+    'assoc_users'    => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ',
+    'create' => array(
+        'error'   => 'Company was not created, please try again.',
+        'success' => 'Company created successfully.'
+    ),
+    'update' => array(
+        'error'   => 'Company was not updated, please try again',
+        'success' => 'Company updated successfully.'
+    ),
+    'delete' => array(
+        'confirm' => 'Are you sure you wish to delete this company?',
+        'error'   => 'There was an issue deleting the company. Please try again.',
+        'success' => 'The Company was deleted successfully.'
+    )
+);
diff --git a/app/lang/en/admin/companies/table.php b/app/lang/en/admin/companies/table.php
new file mode 100644
index 0000000000..2f86126ff2
--- /dev/null
+++ b/app/lang/en/admin/companies/table.php
@@ -0,0 +1,9 @@
+<?php
+return array(
+    'companies' => 'Companies',
+    'create'    => 'Create Company',
+    'title'     => 'Company',
+    'update'    => 'Update Company',
+    'name'      => 'Company Name',
+    'id'        => 'ID',
+);
diff --git a/app/lang/en/general.php b/app/lang/en/general.php
index f1b31b208b..992fc76f28 100755
--- a/app/lang/en/general.php
+++ b/app/lang/en/general.php
@@ -120,6 +120,7 @@
     'select_user'			=> 'Select a User',
     'select_date'			=> 'Select Date',
     'select_statuslabel'	=> 'Select Status',
+    'select_company'    			=> 'Select Company',
     'settings'				=> 'Settings',
     'sign_in'				=> 'Sign in',
     'site_name'				=> 'Site Name',
diff --git a/app/models/Company.php b/app/models/Company.php
index d039620a0b..2e88e45949 100644
--- a/app/models/Company.php
+++ b/app/models/Company.php
@@ -30,7 +30,7 @@ final class Company extends Elegant
 
     public static function getSelectList()
     {
-        $select_company = Lang::get('admin/companies/general.select_company');
+        $select_company = Lang::get('general.select_company');
         return ['0' => $select_company] + DB::table('companies')->orderBy('name', 'ASC')->lists('name', 'id');
     }