diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
index b37ad7950..36e86ce6e 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
@@ -510,41 +510,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 			return;
 		}
 		
-		if (empresaEmail == null) {
-			empresaEmail = new EmpresaEmail();
-			empresaEmail.setEmpresa(empresa);
-			empresaEmail.setEmailDe(textEmailDe.getValue());
-			empresaEmail.setAssunto(textAssunto.getValue());
-			empresaEmail.setAssuntoFiscal(textAssuntoFiscal.getValue());
-			empresaEmail.setTextoCupomEmbarque(messageCupomEmbarque.getValue());
-			empresaEmail.setTextoEmail(messageConteudoEmail.getValue());
-			empresaEmail.setTextoEmailFiscal(messageConteudoEmailFiscal.getValue());
-			empresaEmail = empresaEmailService.suscribir(empresaEmail);
-		} else {
-			empresaEmail.setEmailDe(textEmailDe.getValue());
-			empresaEmail.setAssunto(textAssunto.getValue());
-			empresaEmail.setAssuntoFiscal(textAssuntoFiscal.getValue());
-			empresaEmail.setTextoCupomEmbarque(messageCupomEmbarque.getValue());
-			empresaEmail.setTextoEmail(messageConteudoEmail.getValue());
-			empresaEmail.setTextoEmailFiscal(messageConteudoEmailFiscal.getValue());
-			empresaEmailService.actualizacion(empresaEmail);
-		}
-
-		if (empresaEmailConfig == null) {
-			empresaEmailConfig = new EmpresaEmailConfig();
-			empresaEmailConfig.setEmpresa(empresa);
-			empresaEmailConfig.setSmtpEmail(textEmail.getValue());
-			empresaEmailConfig.setSenha(textSenhaEmail.getValue());
-			empresaEmailConfig.setSmtp(textSMTPHost.getValue());
-			empresaEmailConfig.setSmtpPorta(textSMTPPorta.getValue());
-			empresaEmailConfig = empresaEmailConfigService.suscribir(empresaEmailConfig);
-		} else {
-			empresaEmailConfig.setSmtpEmail(textEmail.getValue());
-			empresaEmailConfig.setSenha(textSenhaEmail.getValue());
-			empresaEmailConfig.setSmtp(textSMTPHost.getValue());
-			empresaEmailConfig.setSmtpPorta(textSMTPPorta.getValue());
-			empresaEmailConfigService.actualizacion(empresaEmailConfig);
-		}
+		
 
 		boolean isBPe = false;
 		
@@ -624,6 +590,42 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 
 			empresaService.suscribirActualizacion(empresa);
 			empresaList.updateItem(empresa);
+			
+			if (empresaEmail == null) {
+				empresaEmail = new EmpresaEmail();
+				empresaEmail.setEmpresa(empresa);
+				empresaEmail.setEmailDe(textEmailDe.getValue());
+				empresaEmail.setAssunto(textAssunto.getValue());
+				empresaEmail.setAssuntoFiscal(textAssuntoFiscal.getValue());
+				empresaEmail.setTextoCupomEmbarque(messageCupomEmbarque.getValue());
+				empresaEmail.setTextoEmail(messageConteudoEmail.getValue());
+				empresaEmail.setTextoEmailFiscal(messageConteudoEmailFiscal.getValue());
+				empresaEmail = empresaEmailService.suscribir(empresaEmail);
+			} else {
+				empresaEmail.setEmailDe(textEmailDe.getValue());
+				empresaEmail.setAssunto(textAssunto.getValue());
+				empresaEmail.setAssuntoFiscal(textAssuntoFiscal.getValue());
+				empresaEmail.setTextoCupomEmbarque(messageCupomEmbarque.getValue());
+				empresaEmail.setTextoEmail(messageConteudoEmail.getValue());
+				empresaEmail.setTextoEmailFiscal(messageConteudoEmailFiscal.getValue());
+				empresaEmailService.actualizacion(empresaEmail);
+			}
+
+			if (empresaEmailConfig == null) {
+				empresaEmailConfig = new EmpresaEmailConfig();
+				empresaEmailConfig.setEmpresa(empresa);
+				empresaEmailConfig.setSmtpEmail(textEmail.getValue());
+				empresaEmailConfig.setSenha(textSenhaEmail.getValue());
+				empresaEmailConfig.setSmtp(textSMTPHost.getValue());
+				empresaEmailConfig.setSmtpPorta(textSMTPPorta.getValue());
+				empresaEmailConfig = empresaEmailConfigService.suscribir(empresaEmailConfig);
+			} else {
+				empresaEmailConfig.setSmtpEmail(textEmail.getValue());
+				empresaEmailConfig.setSenha(textSenhaEmail.getValue());
+				empresaEmailConfig.setSmtp(textSMTPHost.getValue());
+				empresaEmailConfig.setSmtpPorta(textSMTPPorta.getValue());
+				empresaEmailConfigService.actualizacion(empresaEmailConfig);
+			}
 
 			Messagebox.show(Labels.getLabel("editarEmpresaController.MSG.suscribirOK"),
 					Labels.getLabel("editarEmpresaController.window.title"),