diff --git a/src/actions/DiscoveryActions.js b/src/actions/DiscoveryActions.js
index e9c02369..596bc335 100644
--- a/src/actions/DiscoveryActions.js
+++ b/src/actions/DiscoveryActions.js
@@ -142,7 +142,8 @@ const begin = (device: TrezorDevice, network: string): AsyncAction => async (dis
         },
         path: coinToDiscover.bip44,
         keepSession: true, // acquire and hold session
-        useEmptyPassphrase: !device.instance,
+        //useEmptyPassphrase: !device.instance,
+        useEmptyPassphrase: device.useEmptyPassphrase,
     });
 
     // handle TREZOR response error
@@ -264,7 +265,8 @@ const finish = (device: TrezorDevice, discoveryProcess: Discovery): AsyncAction
             state: device.state,
         },
         keepSession: false,
-        useEmptyPassphrase: !device.instance,
+        // useEmptyPassphrase: !device.instance,
+        useEmptyPassphrase: device.useEmptyPassphrase,
     });
 
     await dispatch(BlockchainActions.subscribe(discoveryProcess.network));
diff --git a/src/actions/ReceiveActions.js b/src/actions/ReceiveActions.js
index 6f193e48..95d56119 100644
--- a/src/actions/ReceiveActions.js
+++ b/src/actions/ReceiveActions.js
@@ -67,7 +67,8 @@ export const showAddress = (path: Array<number>): AsyncAction => async (dispatch
             state: selected.state,
         },
         path,
-        useEmptyPassphrase: !selected.instance,
+        // useEmptyPassphrase: !selected.instance,
+        useEmptyPassphrase: selected.useEmptyPassphrase,
     });
 
     if (response && response.success) {
diff --git a/src/actions/SendFormActions.js b/src/actions/SendFormActions.js
index f26664f3..90ddf02e 100644
--- a/src/actions/SendFormActions.js
+++ b/src/actions/SendFormActions.js
@@ -458,7 +458,8 @@ export const onSend = (): AsyncAction => async (dispatch: Dispatch, getState: Ge
             instance: selected.instance,
             state: selected.state,
         },
-        useEmptyPassphrase: !selected.instance,
+        // useEmptyPassphrase: !selected.instance,
+        useEmptyPassphrase: selected.useEmptyPassphrase,
         path: account.addressPath,
         transaction: txData,
     });
diff --git a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js
index a52bb769..969d3363 100644
--- a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js
+++ b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js
@@ -58,14 +58,14 @@ class MenuItems extends Component {
         if (!this.showDeviceMenu()) return null;
         return (
             <Wrapper>
-                <Item onClick={() => this.onDeviceMenuClick('settings', this.props.device)}>
+                {/* <Item onClick={() => this.onDeviceMenuClick('settings', this.props.device)}>
                     <Icon
                         icon={icons.COG}
                         size={25}
                         color={colors.TEXT_SECONDARY}
                     />
                     <Label>Device settings</Label>
-                </Item>
+                </Item> */}
                 <Item onClick={() => this.onDeviceMenuClick('forget', this.props.device)}>
                     <Icon
                         icon={icons.EJECT}
@@ -81,7 +81,7 @@ class MenuItems extends Component {
                             size={25}
                             color={colors.TEXT_SECONDARY}
                         />
-                        <Label>Create hidden wallet</Label>
+                        <Label>Change wallet type</Label>
                     </Item>
                 )}
                 {this.showRenewSession() && (