diff --git a/packages/keepkey-desktop-app/src/App.tsx b/packages/keepkey-desktop-app/src/App.tsx
index ebe89edc7..e659dd241 100644
--- a/packages/keepkey-desktop-app/src/App.tsx
+++ b/packages/keepkey-desktop-app/src/App.tsx
@@ -214,6 +214,17 @@ export const App = () => {
 
       async modalPin(pinRequestType2: PinMatrixRequestType2): Promise<string> {
         const pinRequestType: PinMatrixRequestType = mapPinRequestType(pinRequestType2)
+        if (window.localStorage.getItem('onboarded') !== 'true') {
+          await new Promise(resolve => {
+            const interval = setInterval(() => {
+              if (window.localStorage.getItem('onboarded') === 'true') {
+                resolve(true)
+                clearInterval(interval)
+              }
+            }, 500)
+          })
+          hardwareError.close()
+        }
         const out = deferred<string>()
         dispatch({
           type: WalletActions.OPEN_KEEPKEY_PIN,
diff --git a/packages/keepkey-desktop/package.json b/packages/keepkey-desktop/package.json
index 1f4a10b41..fb94f59b0 100644
--- a/packages/keepkey-desktop/package.json
+++ b/packages/keepkey-desktop/package.json
@@ -1,6 +1,6 @@
 {
     "name": "keepkey-desktop",
-    "version": "2.0.20",
+    "version": "2.0.26",
     "author": {
         "name": "KeepKey",
         "email": "support@keepkey.com"
diff --git a/packages/keepkey-sdk-server/src/controllers/utxo.ts b/packages/keepkey-sdk-server/src/controllers/utxo.ts
index 6a0014506..c50e0011a 100644
--- a/packages/keepkey-sdk-server/src/controllers/utxo.ts
+++ b/packages/keepkey-sdk-server/src/controllers/utxo.ts
@@ -47,7 +47,12 @@ export class UtxoController extends ApiController {
     if (body.vaultAddress) input.vaultAddress = body.vaultAddress
     if (body.opReturnData) input.opReturnData = body.opReturnData
 
-    console.log('*** input: ', JSON.stringify(input))
+    for (let i = 0; i < input.outputs.length; i++) {
+      let output = input.outputs[i]
+      if (output.address && !output.address.startsWith('bitcoincash:')) {
+        output.address = 'bitcoincash:' + output.address
+      }
+    }
 
     return await this.context.wallet.btcSignTx(input)
   }