diff --git a/admin/DashboardController.php b/admin/DashboardController.php
index f4c4ead..8006af2 100644
--- a/admin/DashboardController.php
+++ b/admin/DashboardController.php
@@ -979,8 +979,6 @@ HTML;
         $cv = fn(string $k, string $d = '') => self::h($company[$k] ?? $d);
         $name              = $cv('name');
         $display_name      = $cv('display_name');
-        $phone_number_id   = $cv('phone_number_id');
-        $display_phone     = $cv('display_phone');
         $api_base_url      = $cv('api_base_url');
         $api_key           = $cv('api_key');
         $config_json       = $cv('config_json');
@@ -1153,17 +1151,6 @@ HTML;
               <input type="text" name="display_name" value="{$display_name}" placeholder="ABC S.A.">
             </div>
           </div>
-          <div class="form-row">
-            <div class="form-group">
-              <label>WhatsApp Phone Number ID *</label>
-              <input type="text" name="phone_number_id" value="{$phone_number_id}" required placeholder="123456789012345">
-              <div class="hint">N&uacute;mero WA Business desde el que se env&iacute;an los mensajes. Puede ser el mismo en varias empresas. Los mensajes se enrutan por el n&uacute;mero del remitente (pesta&ntilde;a N&uacute;meros WhatsApp).</div>
-            </div>
-            <div class="form-group">
-              <label>Tel&eacute;fono mostrado</label>
-              <input type="text" name="display_phone" value="{$display_phone}" placeholder="+573001234567">
-            </div>
-          </div>
           <div class="form-row">
             <div class="form-group">
               <label>API Base URL *</label>
diff --git a/services/CompanyRepository.php b/services/CompanyRepository.php
index 0fc2a3a..733b224 100644
--- a/services/CompanyRepository.php
+++ b/services/CompanyRepository.php
@@ -38,7 +38,7 @@ class CompanyRepository
         $db = db();
         $id = (int)($data['id'] ?? 0);
 
-        $fields = ['name', 'display_name', 'phone_number_id', 'display_phone', 'api_base_url', 'api_key', 'bot_type', 'requires_approval', 'is_active', 'config_json'];
+        $fields = ['name', 'display_name', 'api_base_url', 'api_key', 'bot_type', 'requires_approval', 'is_active', 'config_json', 'erp_active_users'];
         $params = [];
         $sets   = [];
         foreach ($fields as $f) {
@@ -55,7 +55,7 @@ class CompanyRepository
             return $id;
         } else {
             // Ensure required fields
-            $required = ['name', 'phone_number_id', 'api_base_url'];
+            $required = ['name', 'api_base_url'];
             $insertData = [];
             foreach ($required as $r) {
                 $insertData[$r] = $data[$r] ?? '';
diff --git a/services/OutboundWorker.php b/services/OutboundWorker.php
index d33db2b..8802c85 100644
--- a/services/OutboundWorker.php
+++ b/services/OutboundWorker.php
@@ -81,7 +81,7 @@ class OutboundWorker
             return ['success' => false, 'error' => 'Payload inválido'];
         }
 
-        $phoneNumberId = $item['phone_number_id'];
+        $phoneNumberId = $item['phone_number_id'] ?: env('WHATSAPP_DEFAULT_PHONE_NUMBER_ID', '');
         $type          = $item['message_type'];
         $to            = $item['to_number'];
 
diff --git a/setup/migrate.php b/setup/migrate.php
index f69318f..c72ae30 100644
--- a/setup/migrate.php
+++ b/setup/migrate.php
@@ -86,7 +86,7 @@ $db->exec("
         id                INT AUTO_INCREMENT PRIMARY KEY,
         name              VARCHAR(150)  NOT NULL,
         display_name      VARCHAR(150),
-        phone_number_id   VARCHAR(50)   NOT NULL,
+        phone_number_id   VARCHAR(50)   NOT NULL DEFAULT '',
         display_phone     VARCHAR(30),
         api_base_url      VARCHAR(500)  NOT NULL,
         api_key           VARCHAR(255),