diff --git a/source/app/controllers/pacs/comerciodigital/comercio.py b/source/app/controllers/pacs/comerciodigital/comercio.py
index 694e148..1c17607 100644
--- a/source/app/controllers/pacs/comerciodigital/comercio.py
+++ b/source/app/controllers/pacs/comerciodigital/comercio.py
@@ -335,7 +335,7 @@ class PACComercioDigital(object):
             'Host': host,
             'Connection' : 'Keep-Alive',
         }
-        data = {'usr': data['rfc'], 'pwd': data['password']}
+        data = {'usr': data['user'], 'pwd': data['pass']}
         try:
             result = requests.get(url, params=data, headers=headers, timeout=TIMEOUT)
         except ConnectionError as e:
diff --git a/source/app/models/main.py b/source/app/models/main.py
index e9e4b07..e691f70 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -10488,10 +10488,6 @@ def _migrate_cert(rfc):
     conectar(args)
     log.info('Exportando certificados...')
 
-    obj = Certificado.get(Certificado.es_fiel==False)
-    cert = utils.SATCertificate
-    cert.save_cert(obj)
-
     auth = Emisor.get_auth()
     data = {
         'lst_pac': 'finkok',
@@ -10500,6 +10496,10 @@ def _migrate_cert(rfc):
     }
     Configuracion.add(data)
 
+    obj = Certificado.get(Certificado.es_fiel==False)
+    cert = utils.SATCertificate
+    cert.save_cert(obj)
+
     desconectar()
     log.info('Proceso terminado correctamente...')
     return
diff --git a/source/templates/login.html b/source/templates/login.html
index 7f41a58..8df91de 100644
--- a/source/templates/login.html
+++ b/source/templates/login.html
@@ -40,6 +40,7 @@ webix.ready(function(){
         var value = data.json();
         $$("title_login").setHTML(value);
     })
+    $$("txt_rfc").focus();
 });
 
 </script>