diff --git a/interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml b/interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml
index 7dcdf9b434..619547ef43 100644
--- a/interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml
+++ b/interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml
@@ -664,7 +664,7 @@ Rectangle {
                         text: "LOG IN"
 
                         onClicked: {
-                            sendToScript({method: 'needsLogIn_loginClicked'});
+                            sendToScript({method: 'marketplace_loginClicked'});
                         }
                     }
 
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 635932ea1c..47f3b774b2 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1206,10 +1206,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     connect(&domainHandler, SIGNAL(connectedToDomain(QUrl)), SLOT(updateWindowTitle()));
     connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle()));
     connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this]() {
-        auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-        if (tabletScriptingInterface) {
-            tabletScriptingInterface->setQmlTabletRoot(SYSTEM_TABLET, nullptr);
-        }
         auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
         entityScriptingInterface->deleteEntity(getTabletScreenID());
         entityScriptingInterface->deleteEntity(getTabletHomeButtonID());
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 17ff918243..86806fd8b4 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -377,6 +377,9 @@ function deleteSendMoneyParticleEffect() {
 }
 
 function onUsernameChanged() {
+    if (ui.checkIsOpen()) {
+        ui.open(WALLET_QML_SOURCE);
+    }
 }    
 
 var MARKETPLACE_QML_PATH = "hifi/commerce/marketplace/Marketplace.qml";
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index e059081741..38287e3af3 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -615,11 +615,10 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
         openMarketplace(message.itemId, message.itemEdition);
         break;
     case 'passphrasePopup_cancelClicked':
-    case 'needsLogIn_cancelClicked':
         // Should/must NOT check for wallet setup.
         openMarketplace();
         break;
-    case 'needsLogIn_loginClicked':
+    case 'marketplace_loginClicked':
         openLoginWindow();
         break;
     case 'disableHmdPreview':