diff --git a/ui/v2.5/src/components/Performers/styles.scss b/ui/v2.5/src/components/Performers/styles.scss
index e35b4a304..1686c03ac 100644
--- a/ui/v2.5/src/components/Performers/styles.scss
+++ b/ui/v2.5/src/components/Performers/styles.scss
@@ -233,6 +233,10 @@
 }
 
 .performer-select {
+  .performer-disambiguation {
+    white-space: pre;
+  }
+
   .alias {
     font-weight: bold;
     white-space: pre;
diff --git a/ui/v2.5/src/components/Settings/Inputs.tsx b/ui/v2.5/src/components/Settings/Inputs.tsx
index 6094ba5ce..b1999fd20 100644
--- a/ui/v2.5/src/components/Settings/Inputs.tsx
+++ b/ui/v2.5/src/components/Settings/Inputs.tsx
@@ -322,7 +322,10 @@ export const SettingModal = <T extends {}>(props: ISettingModal<T>) => {
             type="submit"
             variant="primary"
             onClick={() => close(currentValue)}
-            disabled={!currentValue || (validate && !validate(currentValue))}
+            disabled={
+              currentValue === undefined ||
+              (validate && !validate(currentValue))
+            }
           >
             <FormattedMessage id="actions.confirm" />
           </Button>
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index fdfe8a73c..7fc0902fb 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -518,6 +518,6 @@ div.react-datepicker {
 }
 
 .react-select-image-option {
-  align-items: center;
+  align-items: baseline;
   display: flex;
 }
diff --git a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
index 6270d7f05..c6fb16822 100755
--- a/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
+++ b/ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
@@ -356,7 +356,7 @@ const PerformerTaggerList: React.FC<IPerformerTaggerListProps> = ({
       [performerID]: {
         message: intl.formatMessage(
           { id: "performer_tagger.failed_to_save_performer" },
-          { studio: modalPerformer?.name }
+          { performer: modalPerformer?.name }
         ),
         details:
           message === "UNIQUE constraint failed: performers.name"