diff --git a/app/components/Onboarding/Onboarding.js b/app/components/Onboarding/Onboarding.js
index 37147c7521d..79083024ade 100644
--- a/app/components/Onboarding/Onboarding.js
+++ b/app/components/Onboarding/Onboarding.js
@@ -159,16 +159,16 @@ const Onboarding = ({
           </FormContainer>
         )
       case 3:
+        // eslint-disable-next-line no-case-declarations
+        let message = 'It looks like you already have a wallet'
+        if (initWalletProps.loginProps.existingWalletDir && connectionType === 'local') {
+          message += ` (we found one at ${initWalletProps.loginProps.existingWalletDir})`
+        } else {
+          message += ` at ${connectionHost.split(':')[0]}`
+        }
+        message += '. Please enter your wallet password to unlock it.'
         return (
-          <FormContainer
-            title="Welcome back!"
-            description={`It looks like you already have a wallet
-              ${Boolean(initWalletProps.loginProps.existingWalletDir) &&
-                `(we found one at \`${initWalletProps.loginProps.existingWalletDir}\`)`}.
-            Please enter your wallet password to unlock it.`}
-            back={null}
-            next={null}
-          >
+          <FormContainer title="Welcome back!" description={`${message}`} back={null} next={null}>
             <Login {...initWalletProps.loginProps} />
           </FormContainer>
         )
diff --git a/app/lib/zap/controller.js b/app/lib/zap/controller.js
index b3592119a61..3eaab66017b 100644
--- a/app/lib/zap/controller.js
+++ b/app/lib/zap/controller.js
@@ -199,8 +199,7 @@ class ZapController {
         // which indicates that the requested operation is not implemented or not supported/enabled in the service.
         // See https://github.com/grpc/grpc-node/blob/master/packages/grpc-native-core/src/constants.js#L129
         if (e.code === 12) {
-          errors.host =
-            'Unable to connect to host. Please ensure wallet is unlocked before connecting.'
+          return this.startWalletUnlocker()
         }
 
         // Other error codes such as UNAVAILABLE most likely indicate that there is a problem with the host.
@@ -336,11 +335,6 @@ class ZapController {
       this.startWalletUnlocker()
     })
 
-    this.neutrino.on('lightning-grpc-active', () => {
-      mainLog.info('Lightning gRPC active')
-      this.startLightningWallet()
-    })
-
     this.neutrino.on('chain-sync-waiting', () => {
       mainLog.info('Neutrino sync waiting')
       this.sendMessage('lndSyncStatus', 'waiting')
@@ -467,6 +461,7 @@ class ZapController {
    */
   _registerIpcListeners() {
     ipcMain.on('startLnd', (event, options: onboardingOptions) => this.finishOnboarding(options))
+    ipcMain.on('startLightningWallet', () => this.startLightningWallet())
   }
 
   /**
@@ -474,6 +469,7 @@ class ZapController {
    */
   _removeIpcListeners() {
     ipcMain.removeAllListeners('startLnd')
+    ipcMain.removeAllListeners('startLightningWallet')
     ipcMain.removeAllListeners('walletUnlocker')
     ipcMain.removeAllListeners('lnd')
   }
diff --git a/app/reducers/onboarding.js b/app/reducers/onboarding.js
index e19d2e2ec56..e9fd1a1eb17 100644
--- a/app/reducers/onboarding.js
+++ b/app/reducers/onboarding.js
@@ -320,6 +320,7 @@ export const unlockWallet = wallet_password => dispatch => {
 export const walletUnlocked = () => dispatch => {
   dispatch({ type: WALLET_UNLOCKED })
   dispatch({ type: ONBOARDING_FINISHED })
+  ipcRenderer.send('startLightningWallet')
 }
 
 export const unlockWalletError = () => dispatch => {