diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 546395995..43b20ef7c 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -38,6 +38,7 @@ angular.module('copayApp.controllers').controller('createController',
 
       $scope.setTotalCopayers(tc);
       updateRCSelect(tc);
+      resetPasswordFields();
     });
 
     $scope.coinChanged = function() {
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 443fb11d8..4847c3bb7 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -16,6 +16,7 @@ angular.module('copayApp.controllers').controller('joinController',
       $scope.bitcoinAlias = (config.bitcoinAlias || defaults.bitcoinAlias).toUpperCase();
       $scope.bitcoinCashAlias = (config.bitcoinCashAlias || defaults.bitcoinCashAlias).toUpperCase();
       if (config.cashSupport) $scope.enableCash = true;
+      resetPasswordFields();
       updateSeedSourceSelect();
     });