Merge branch 'autoconnect'

2 files changed, 2 insertions, 6 deletions

diff --git a/app/app.js b/app/app.js
index e28d85582e..4886e42527 100644
--- a/app/app.js
+++ b/app/app.js
@@ -27,12 +27,6 @@ ipcRenderer.on('backend-info', (_event, args) => {
   backend.setLocation(args.addr);
   backend.sync();
   backend.autologin()
-    .then( () => {
-      if(store.getState().settings.autoSecure) {
-        log.info('Autoconnecting...');
-        backend.connect();
-      }
-    })
     .catch( e => {
       if (e.type === 'NO_ACCOUNT') {
         log.debug('No user set in the backend, showing window');
diff --git a/app/lib/backend.js b/app/lib/backend.js
index cbbd555987..e159ca51df 100644
--- a/app/lib/backend.js
+++ b/app/lib/backend.js
@@ -147,6 +147,7 @@ export class Backend {
         // the 'Login Successful' screen to be visible
         setTimeout(() => {
           this._store.dispatch(push('/connect'));
+          this.connect();
         }, 1000);
       }).catch(e => {
         log.error('Failed to log in,', e.message);
@@ -178,6 +179,7 @@ export class Backend {
         this._store.dispatch(accountActions.loginSuccessful(accountData.expiry));
 
         this._store.dispatch(push('/connect'));
+        this.connect();
       })
       .catch( e => {
         log.warn('Unable to autologin,', e.message);