diff --git a/admin/cadQgrupos.php b/admin/cadQgrupos.php
index 7cfcd2b3..966c790c 100644
--- a/admin/cadQgrupos.php
+++ b/admin/cadQgrupos.php
@@ -408,7 +408,7 @@
                             <td>
                                 <fieldset>
                                     <legend class="labels">Nome:</legend>
-                                    <input name="nome" type="text" class="validate[required,length[0,100]] caixas" id="nome2" value="<?= ($acao == 'edita') ?  GetNomeOrganizacao($nome)['nome'] . '"' . 'disabled="disabled' : null; ?>" />
+                                    <input name="nome" type="text" class="validate[required,length[0,100]] caixas" id="nome2" value="<?= ($acao == 'edita') ?  GravaNomeOrganizacao($nome) . '"' . 'disabled="disabled' : null; ?>" />
                                 </fieldset>
                             </td>
                             <td>
diff --git a/admin/queues.php b/admin/queues.php
index 6e371505..824dfa25 100644
--- a/admin/queues.php
+++ b/admin/queues.php
@@ -127,7 +127,7 @@ if ($acao == "deleta") {
                         <td width="50" align="center"><?php echo $dados['id']; ?></td>
                         <td>
                             <a href="#" style="color: #000" onclick="abre_janela('780', '560', 'index.php?idProg=11002&pbxRequest=1&acao=edita&id=<?php echo $dados['id']; ?><?= $params; ?>');">
-                                <?= GetNomeOrganizacao($dados['nome'])['nome']; ?>
+                                <?= GravaNomeOrganizacao($dados['nome']); ?>
                             </a>
                         </td>
                         <td width="120"><?php echo $dados['numero']; ?></td>
diff --git a/asterisk/var_lib_asterisk/scripts/manutencaoDB/importaEmpresa.php b/asterisk/var_lib_asterisk/scripts/manutencaoDB/importaEmpresa.php
index 844e0298..49a33e5c 100755
--- a/asterisk/var_lib_asterisk/scripts/manutencaoDB/importaEmpresa.php
+++ b/asterisk/var_lib_asterisk/scripts/manutencaoDB/importaEmpresa.php
@@ -55,6 +55,8 @@ try {
 
     importIdTables($dbcon);
 
+    corrigeDadosFila($dbcon);
+
     /*
      *  Apaga todas as fk.
      */
@@ -313,6 +315,19 @@ function importIdTables($dbcon)
     }
 }
 
+function corrigeDadosFila($dbcon)
+{
+    $org_id = GetOrganizacao();
+    $query = "SELECT id, nome FROM pbx_queues_grupos;";
+    $result = pg_query($dbcon, $query);
+    $dados = pg_fetch_all($result);
+
+    foreach ($dados as $f) {
+        $sql = sprintf("UPDATE pbx_queues_grupos SET nome = %s WHERE id = %s", "{$f['nome']}@{$org_id}", $f['id']);
+        $result = pg_query($dbcon, $sql);
+    }
+}
+
 function ___Gravalog($message)
 {
     $line = "\n----------------------------------------------\n";