diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index bbf4d992a..1e54684ed 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -63,9 +63,11 @@ angular.module('copayApp.controllers').controller('createController',
       var seedOptions = [{
         id: 'new',
         label: gettextCatalog.getString('Random'),
+        supportsTestnet: true
       }, {        
         id: 'set',
         label: gettextCatalog.getString('Specify Recovery Phrase...'),
+        supportsTestnet: false
       }];
 
       $scope.seedSource = seedOptions[0];
@@ -81,12 +83,14 @@ angular.module('copayApp.controllers').controller('createController',
           seedOptions.push({
             id: walletService.externalSource.ledger.id,
             label: walletService.externalSource.ledger.longName,
+            supportsTestnet: walletService.externalSource.ledger.supportsTestnet
           });
 
         if (walletService.externalSource.trezor.supported) {
           seedOptions.push({
             id: walletService.externalSource.trezor.id,
             label: walletService.externalSource.trezor.longName,
+            supportsTestnet: walletService.externalSource.trezor.supportsTestnet
           });
         }
 
@@ -94,6 +98,7 @@ angular.module('copayApp.controllers').controller('createController',
           seedOptions.push({
             id: walletService.externalSource.intelTEE.id,
             label: walletService.externalSource.intelTEE.longName,
+            supportsTestnet: walletService.externalSource.intelTEE.supportsTestnet
           });
         }
       }
@@ -165,7 +170,7 @@ angular.module('copayApp.controllers').controller('createController',
           account = account - 1;
 
         opts.account = account;
-        ongoingProcess.set('connecting' + $scope.seedSource.id, true);
+        ongoingProcess.set('connecting ' + $scope.seedSource.id, true);
 
         var src;
         switch ($scope.seedSource.id) {
@@ -183,8 +188,8 @@ angular.module('copayApp.controllers').controller('createController',
             return;
         }
 
-        src.getInfoForNewWallet(opts.n > 1, account, function(err, lopts) {
-          ongoingProcess.set('connecting' + $scope.seedSource.id, false);
+        src.getInfoForNewWallet(opts.n > 1, account, opts.networkName, function(err, lopts) {
+          ongoingProcess.set('connecting ' + $scope.seedSource.id, false);
           if (err) {
             popupService.showAlert(gettextCatalog.getString('Error'), err);
             return;
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index e34546d9e..3776671ee 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -262,7 +262,7 @@ angular.module('copayApp.controllers').controller('importController',
     };
 
     $scope.importTrezor = function(account, isMultisig) {
-      trezor.getInfoForNewWallet(isMultisig, account, function(err, lopts) {
+      trezor.getInfoForNewWallet(isMultisig, account, 'livenet', function(err, lopts) {
         ongoingProcess.clear();
         if (err) {
           popupService.showAlert(gettextCatalog.getString('Error'), err);
@@ -318,7 +318,7 @@ angular.module('copayApp.controllers').controller('importController',
     };
 
     $scope.importLedger = function(account) {
-      ledger.getInfoForNewWallet(true, account, function(err, lopts) {
+      ledger.getInfoForNewWallet(true, account, 'livenet', function(err, lopts) {
         ongoingProcess.clear();
         if (err) {
           popupService.showAlert(gettextCatalog.getString('Error'), err);
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 6800fc9fc..b2e858969 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -142,7 +142,7 @@ angular.module('copayApp.controllers').controller('joinController',
         ongoingProcess.set('connecting' + self.seedSourceId, true);
         var src = self.seedSourceId == walletService.externalSource.ledger.id ? ledger : trezor;
 
-        src.getInfoForNewWallet(true, account, function(err, lopts) {
+        src.getInfoForNewWallet(true, account, 'livenet', function(err, lopts) {
           ongoingProcess.set('connecting' + self.seedSourceId, false);
           if (err) {
             popupService.showAlert(gettextCatalog.getString('Error'), err);
diff --git a/src/js/controllers/preferencesExternal.js b/src/js/controllers/preferencesExternal.js
index c44c0af6c..3f7366f1f 100644
--- a/src/js/controllers/preferencesExternal.js
+++ b/src/js/controllers/preferencesExternal.js
@@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('preferencesExternalController
     return source.id == wallet.getPrivKeyExternalSourceName();
   });
 
-  if ($scope.externalSource.hasEmbeddedHardware) {
+  if ($scope.externalSource.isEmbeddedHardware) {
     $scope.hardwareConnected = $scope.externalSource.version.length > 0;
 
     $scope.showMneumonicFromHardwarePopup = function() {
diff --git a/src/js/services/intelTEE.js b/src/js/services/intelTEE.js
index 36dbc5181..39859c863 100644
--- a/src/js/services/intelTEE.js
+++ b/src/js/services/intelTEE.js
@@ -12,7 +12,8 @@ angular.module('copayApp.services')
       name: 'Intel TEE',
       longName: 'Intel TEE Hardware Wallet',
       derivationStrategy: 'BIP44',
-      hasEmbeddedHardware: true
+      isEmbeddedHardware: true,
+      supportsTestnet: true
     };
 
     if (!root.description.supported) {
@@ -28,7 +29,7 @@ angular.module('copayApp.services')
       $log.error('Failed to create Intel Wallet enclave');
     }
 
-    root.getInfoForNewWallet = function(isMultisig, account, callback) {
+    root.getInfoForNewWallet = function(isMultisig, account, networkName, callback) {
       var opts = {};
       initSource(opts, function(err, opts) {
         if (err) return callback(err);
@@ -37,7 +38,7 @@ angular.module('copayApp.services')
           if (err) return callback(err);
 
           opts.entropySource = entropySource;
-          root.getXPubKey(opts.hwInfo.id, hwWallet.getAddressPath(root.description.id, isMultisig, account, opts.networkName), function(data) {
+          root.getXPubKey(opts.hwInfo.id, hwWallet.getAddressPath(root.description.id, isMultisig, account, networkName), function(data) {
             if (!data.success) {
               $log.warn(data.message);
               return callback(data);
@@ -185,7 +186,7 @@ angular.module('copayApp.services')
               name: root.description.id,
               id: teeStatus
             };
-            $log.debug('TEE wallet created: ' + opts.hwInfo);
+            $log.debug('TEE wallet created: ' + opts.hwInfo.id);
             return callback(null, opts);
         }
     };
diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js
index 5336f39ce..abfe6c8f7 100644
--- a/src/js/services/ledger.js
+++ b/src/js/services/ledger.js
@@ -10,7 +10,8 @@ angular.module('copayApp.services')
       id: 'ledger',
       name: 'Ledger',
       longName: 'Ledger Hardware Wallet',
-      hasEmbeddedHardware: false
+      isEmbeddedHardware: false,
+      supportsTestnet: false
     };
 
     root.callbacks = {};
@@ -43,7 +44,8 @@ angular.module('copayApp.services')
       return callback(opts);
     };
 
-    root.getInfoForNewWallet = function(isMultisig, account, callback) {
+    root.getInfoForNewWallet = function(isMultisig, account, networkName, callback) {
+      // networkName not used for this hardware (always livenet)
       root.getEntropySource(isMultisig, account, function(err, entropySource) {
         if (err) return callback(err);
 
diff --git a/src/js/services/trezor.js b/src/js/services/trezor.js
index c3c406866..0411386fc 100644
--- a/src/js/services/trezor.js
+++ b/src/js/services/trezor.js
@@ -13,7 +13,8 @@ angular.module('copayApp.services')
       name: 'Trezor',
       longName: 'Trezor Hardware Wallet',
       derivationStrategy: 'BIP48',
-      hasEmbeddedHardware: false
+      isEmbeddedHardware: false,
+      supportsTestnet: false
     };
 
     root.getEntropySource = function(isMultisig, account, callback) {
@@ -40,7 +41,8 @@ angular.module('copayApp.services')
       return callback(opts);
     };
 
-    root.getInfoForNewWallet = function(isMultisig, account, callback) {
+    root.getInfoForNewWallet = function(isMultisig, account, networkName, callback) {
+      // networkName not used for this hardware (always livenet)
       var opts = {};
       root.getEntropySource(isMultisig, account, function(err, data) {
         if (err) return callback(err);
diff --git a/www/views/preferencesExternal.html b/www/views/preferencesExternal.html
index bfb3562ad..22ae4f276 100644
--- a/www/views/preferencesExternal.html
+++ b/www/views/preferencesExternal.html
@@ -7,13 +7,13 @@
   <ion-content>
     <div ng-include="'views/includes/walletItem.html'"></div>
 
-    <div ng-if="!hasEmbeddedHardware">
+    <div ng-if="!externalSource.isEmbeddedHardware">
       <div ng-if="!hardwareConnected" class="info centered">
         <span translate>No hardware information available.</span>
       </div>
     </div>
 
-    <div ng-if="hasEmbeddedHardware">    
+    <div ng-if="externalSource.isEmbeddedHardware">    
       <div ng-if="!hardwareConnected" class="warning centered">
         <span translate>Hardware not connected.</span><br>
         <span translate>Check installation and retry.</span>
diff --git a/www/views/tab-create-personal.html b/www/views/tab-create-personal.html
index 21794f56a..e532165c9 100644
--- a/www/views/tab-create-personal.html
+++ b/www/views/tab-create-personal.html
@@ -90,7 +90,7 @@
             ng-model="formData.derivationPath">
           </label>
 
-          <ion-toggle ng-show="seedSource.id == 'new'" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
+          <ion-toggle ng-show="seedSource.supportsTestnet" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
             <span translate>Testnet</span>
           </ion-toggle>
 
diff --git a/www/views/tab-create-shared.html b/www/views/tab-create-shared.html
index 4b3100247..edd6f8175 100644
--- a/www/views/tab-create-shared.html
+++ b/www/views/tab-create-shared.html
@@ -120,7 +120,7 @@
             ng-model="formData.derivationPath">
           </label>
 
-          <ion-toggle ng-show="seedSource.id == 'new' || seedSource.id == 'intelTEE'" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
+          <ion-toggle ng-show="seedSource.supportsTestnet" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
             Testnet
           </ion-toggle>