diff --git a/admin/cadCallBack.php b/admin/cadCallBack.php
index 6073849c..09456411 100644
--- a/admin/cadCallBack.php
+++ b/admin/cadCallBack.php
@@ -108,6 +108,10 @@
     function salvarAsterisk($descricao, $opcaoDest, $acaoDest, $opcao1, $acao1, $ramalSaida, $tempoDesligamento, $org_id) {
         global $dbcon;
 
+        if(AcoesExist($dbcon, $opcaoDest, $acaoDest) === false && AcoesExist($dbcon, $opcao1, $acao1) === false ) {
+            return false;
+        }
+
         $to_asterisk = Acoes_asterisk($dbcon, $opcaoDest, $acaoDest);
         $to_asterisk_1 = Acoes_asterisk($dbcon, $opcao1, $acao1);
 
@@ -141,6 +145,9 @@
         CommandAsterisk2($dbcon, 'ID_APP', "$org_id$last_id", "$last_id");
 
         pg_query($dbcon,'commit');
+
+        //Retorna last_id para que seja adicionado os modelos vinculados a este ID
+        return $last_id;
     }
 
     if ($acao2 == "salva") {
@@ -156,7 +163,8 @@
             $ramalSaida = $_POST["ramal_saida"];
 
             if ($acao == "inseri") {
-                salvarAsterisk($descricao, $opcaoDest, $acaoDest, $opcao1, $acao1, $ramalSaida, $tempoDesligamento, $org_id);
+                //Faz os procedimentos do salvarAsterisk e retorna para o script o valor do ultimo ID adicionado
+                $last_id = salvarAsterisk($descricao, $opcaoDest, $acaoDest, $opcao1, $acao1, $ramalSaida, $tempoDesligamento, $org_id);
             } else if ($acao == "edita") {
                 //REALIZA BACKUP BO BANCO
                 //@backup($dbcon,'pbx_callback','U',$id,'update','CALLBACK');
@@ -191,7 +199,7 @@
                 if ($acao == "edita") {
                     $idx = $id;
                 } else {
-                    $idx = $id_ult;
+                    $idx = $last_id;
                 }
 
                 $numero = QuotedStr($numeros[$i]);
@@ -209,7 +217,7 @@
 
     if ($acao == "edita") {
         $id = isset($_GET["id"]) ? $_GET["id"] : $_POST["id"];
-        $query = "SELECT * FROM pbx_callback where id='$id'";
+        $query = "SELECT * FROM pbx_callback WHERE id='$id' AND org_id = $org_id";
         $result = pg_query($dbcon, $query);
         $dados = pg_fetch_array($result);
     }