diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts
index 86a1cc2238b..53b66a022ac 100644
--- a/src/ui/form-modal-ui-handler.ts
+++ b/src/ui/form-modal-ui-handler.ts
@@ -111,7 +111,7 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
       if (this.buttonBgs.length) {
         this.buttonBgs[0].off("pointerdown");
         this.buttonBgs[0].on("pointerdown", () => {
-          if (this.submitAction) {
+          if (this.submitAction && globalScene.tweens.getTweensOf(this.modalContainer).length === 0) {
             this.submitAction();
           }
         });
diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/login-form-ui-handler.ts
index 0a0bb7a7c79..10adbca724d 100644
--- a/src/ui/login-form-ui-handler.ts
+++ b/src/ui/login-form-ui-handler.ts
@@ -181,10 +181,6 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
   }
 
   private processExternalProvider(config: ModalConfig): void {
-    this.externalPartyContainer.destroy();
-    this.infoContainer.destroy();
-    this.buildExternalPartyContainer();
-    this.buildInfoContainer();
     this.externalPartyTitle.setText(i18next.t("menu:orUse") ?? "");
     this.externalPartyTitle.setX(20 + this.externalPartyTitle.text.length);
     this.externalPartyTitle.setVisible(true);
@@ -222,31 +218,33 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
     };
 
     this.usernameInfoImage.on("pointerdown", () => {
-      const localStorageKeys = Object.keys(localStorage); // this gets the keys for localStorage
-      const keyToFind = "data_";
-      const dataKeys = localStorageKeys.filter(ls => ls.indexOf(keyToFind) >= 0);
-      if (dataKeys.length > 0 && dataKeys.length <= 2) {
-        const options: OptionSelectItem[] = [];
-        for (let i = 0; i < dataKeys.length; i++) {
-          options.push({
-            label: dataKeys[i].replace(keyToFind, ""),
-            handler: () => {
-              globalScene.ui.revertMode();
-              this.infoContainer.disableInteractive();
-              return true;
-            }
+      if (globalScene.tweens.getTweensOf(this.infoContainer).length === 0) {
+        const localStorageKeys = Object.keys(localStorage); // this gets the keys for localStorage
+        const keyToFind = "data_";
+        const dataKeys = localStorageKeys.filter(ls => ls.indexOf(keyToFind) >= 0);
+        if (dataKeys.length > 0 && dataKeys.length <= 2) {
+          const options: OptionSelectItem[] = [];
+          for (let i = 0; i < dataKeys.length; i++) {
+            options.push({
+              label: dataKeys[i].replace(keyToFind, ""),
+              handler: () => {
+                globalScene.ui.revertMode();
+                this.infoContainer.disableInteractive();
+                return true;
+              }
+            });
+          }
+          globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, {
+            options: options,
+            delay: 1000
           });
-        }
-        globalScene.ui.setOverlayMode(Mode.OPTION_SELECT, {
-          options: options,
-          delay: 1000
-        });
-        this.infoContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width, globalScene.game.canvas.height), Phaser.Geom.Rectangle.Contains);
-      } else {
-        if (dataKeys.length > 2) {
-          return onFail(this.ERR_TOO_MANY_SAVES);
+          this.infoContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width, globalScene.game.canvas.height), Phaser.Geom.Rectangle.Contains);
         } else {
-          return onFail(this.ERR_NO_SAVES);
+          if (dataKeys.length > 2) {
+            return onFail(this.ERR_TOO_MANY_SAVES);
+          } else {
+            return onFail(this.ERR_NO_SAVES);
+          }
         }
       }
     });
diff --git a/src/ui/modal-ui-handler.ts b/src/ui/modal-ui-handler.ts
index 909010e3566..2c3228e42a9 100644
--- a/src/ui/modal-ui-handler.ts
+++ b/src/ui/modal-ui-handler.ts
@@ -122,7 +122,11 @@ export abstract class ModalUiHandler extends UiHandler {
 
       for (let a = 0; a < this.buttonBgs.length; a++) {
         if (a < this.buttonBgs.length) {
-          this.buttonBgs[a].on("pointerdown", (_) => config.buttonActions[a]());
+          this.buttonBgs[a].on("pointerdown", (_) => {
+            if (globalScene.tweens.getTweensOf(this.modalContainer).length === 0) {
+              config.buttonActions[a]();
+            }
+          });
         }
       }