diff --git a/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx b/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx
index ece7589dcfb..2d4565b9091 100644
--- a/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx
+++ b/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx
@@ -26,10 +26,9 @@ import {
   faCogs,
   faFolderOpen,
   faQuestionCircle,
+  faTriangleExclamation,
 } from "@fortawesome/free-solid-svg-icons";
 
-const autoTagScraperID = "builtin_autotag";
-
 interface IIdentifyDialogProps {
   selectedIds?: string[];
   onClose: () => void;
@@ -228,28 +227,11 @@ export const IdentifyDialog: React.FC<IIdentifyDialogProps> = ({
       // default to first stash-box instance only
       const stashBox = allSources.find((s) => s.stash_box_endpoint);
 
-      // add auto-tag as well
-      const autoTag = allSources.find(
-        (s) => s.id === `${SCRAPER_PREFIX}${autoTagScraperID}`
-      );
-
       const newSources: IScraperSource[] = [];
       if (stashBox) {
         newSources.push(stashBox);
       }
 
-      // sanity check - this should always be true
-      if (autoTag) {
-        // don't set organised by default
-        const autoTagCopy = { ...autoTag };
-        autoTagCopy.options = {
-          setOrganized: false,
-          skipMultipleMatches: true,
-          skipSingleNamePerformers: true,
-        };
-        newSources.push(autoTagCopy);
-      }
-
       setSources(newSources);
     }
   }, [allSources, configData]);
@@ -445,6 +427,12 @@ export const IdentifyDialog: React.FC<IIdentifyDialogProps> = ({
         </Button>
       }
     >
+      <div>
+        <p>
+          <Icon icon={faTriangleExclamation} size="xl" />
+          <FormattedMessage id="config.tasks.identify.warning" />
+        </p>
+      </div>
       <Form>
         {selectionStatus}
         <SourcesList
diff --git a/ui/v2.5/src/components/Dialogs/IdentifyDialog/Options.tsx b/ui/v2.5/src/components/Dialogs/IdentifyDialog/Options.tsx
index 0bc31e6ae47..370e69ce6c8 100644
--- a/ui/v2.5/src/components/Dialogs/IdentifyDialog/Options.tsx
+++ b/ui/v2.5/src/components/Dialogs/IdentifyDialog/Options.tsx
@@ -170,6 +170,9 @@ export const OptionsEditor: React.FC<IOptionsEditor> = ({
             id: "config.tasks.identify.set_organized",
           })}
           defaultValue={defaultOptions?.setOrganized ?? undefined}
+          tooltip={intl.formatMessage({
+            id: "config.tasks.identify.organized",
+          })}
           {...checkboxProps}
         />
       </Form.Group>
diff --git a/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
index cbcca94a161..71d20098781 100644
--- a/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/DataManagementTasks.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { Button, Col, Form, Row } from "react-bootstrap";
+import { Button, Form } from "react-bootstrap";
 import {
   mutateMigrateHashNaming,
   mutateMetadataExport,
@@ -21,110 +21,11 @@ import { SettingSection } from "../SettingSection";
 import { BooleanSetting, Setting } from "../Inputs";
 import { ManualLink } from "src/components/Help/context";
 import { Icon } from "src/components/Shared/Icon";
-import { ConfigurationContext } from "src/hooks/Config";
-import { FolderSelect } from "src/components/Shared/FolderSelect/FolderSelect";
 import {
-  faMinus,
-  faPlus,
   faQuestionCircle,
   faTrashAlt,
 } from "@fortawesome/free-solid-svg-icons";
-
-interface ICleanDialog {
-  pathSelection?: boolean;
-  dryRun: boolean;
-  onClose: (paths?: string[]) => void;
-}
-
-const CleanDialog: React.FC<ICleanDialog> = ({
-  pathSelection = false,
-  dryRun,
-  onClose,
-}) => {
-  const intl = useIntl();
-  const { configuration } = React.useContext(ConfigurationContext);
-
-  const libraryPaths = configuration?.general.stashes.map((s) => s.path);
-
-  const [paths, setPaths] = useState<string[]>([]);
-  const [currentDirectory, setCurrentDirectory] = useState<string>("");
-
-  function removePath(p: string) {
-    setPaths(paths.filter((path) => path !== p));
-  }
-
-  function addPath(p: string) {
-    if (p && !paths.includes(p)) {
-      setPaths(paths.concat(p));
-    }
-  }
-
-  let msg;
-  if (dryRun) {
-    msg = (
-      <p>{intl.formatMessage({ id: "actions.tasks.dry_mode_selected" })}</p>
-    );
-  } else {
-    msg = (
-      <p>{intl.formatMessage({ id: "actions.tasks.clean_confirm_message" })}</p>
-    );
-  }
-
-  return (
-    <ModalComponent
-      show
-      icon={faTrashAlt}
-      disabled={pathSelection && paths.length === 0}
-      accept={{
-        text: intl.formatMessage({ id: "actions.clean" }),
-        variant: "danger",
-        onClick: () => onClose(paths),
-      }}
-      cancel={{ onClick: () => onClose() }}
-    >
-      <div className="dialog-container">
-        <div className="mb-3">
-          {paths.map((p) => (
-            <Row className="align-items-center mb-1" key={p}>
-              <Form.Label column xs={10}>
-                {p}
-              </Form.Label>
-              <Col xs={2} className="d-flex justify-content-end">
-                <Button
-                  className="ml-auto"
-                  size="sm"
-                  variant="danger"
-                  title={intl.formatMessage({ id: "actions.delete" })}
-                  onClick={() => removePath(p)}
-                >
-                  <Icon icon={faMinus} />
-                </Button>
-              </Col>
-            </Row>
-          ))}
-
-          {pathSelection ? (
-            <FolderSelect
-              currentDirectory={currentDirectory}
-              setCurrentDirectory={(v) => setCurrentDirectory(v)}
-              defaultDirectories={libraryPaths}
-              appendButton={
-                <Button
-                  variant="secondary"
-                  onClick={() => addPath(currentDirectory)}
-                >
-                  <Icon icon={faPlus} />
-                </Button>
-              }
-            />
-          ) : undefined}
-        </div>
-
-        {msg}
-      </div>
-    </ModalComponent>
-  );
-};
+import { DirectorySelectionDialog } from "./DirectorySelectionDialog";
 
 interface ICleanOptions {
   options: GQL.CleanMetadataInput;
@@ -232,6 +133,45 @@ export const DataManagementTasks: React.FC<IDataManagementTasks> = ({
     return <ImportDialog onClose={() => setDialogOpen({ import: false })} />;
   }
 
+  function renderCleanDialog() {
+    if (dialogOpen.cleanAlert || dialogOpen.clean) {
+      let msg: string;
+      if (cleanOptions.dryRun) {
+        msg = intl.formatMessage({ id: "actions.tasks.dry_mode_selected" });
+      } else {
+        msg = intl.formatMessage({ id: "actions.tasks.clean_confirm_message" });
+      }
+
+      return (
+        <DirectorySelectionDialog
+          allowPathSelection={dialogOpen.clean}
+          message={msg}
+          header={intl.formatMessage({ id: "actions.clean" })}
+          icon={faTrashAlt}
+          acceptButtonText={intl.formatMessage({ id: "actions.clean" })}
+          acceptButtonVariant="danger"
+          onClose={(p) => {
+            // undefined means cancelled
+            if (p !== undefined) {
+              if (dialogOpen.cleanAlert) {
+                // don't provide paths
+                onClean();
+              } else {
+                onClean(p);
+              }
+            }
+
+            setDialogOpen({
+              clean: false,
+              cleanAlert: false,
+            });
+          }}
+        />
+      );
+    }
+    return;
+  }
+
   async function onClean(paths?: string[]) {
     try {
       await mutateMetadataClean({
@@ -380,30 +320,7 @@ export const DataManagementTasks: React.FC<IDataManagementTasks> = ({
     <Form.Group>
       {renderImportAlert()}
       {renderImportDialog()}
-      {dialogOpen.cleanAlert || dialogOpen.clean ? (
-        <CleanDialog
-          dryRun={cleanOptions.dryRun}
-          pathSelection={dialogOpen.clean}
-          onClose={(p) => {
-            // undefined means cancelled
-            if (p !== undefined) {
-              if (dialogOpen.cleanAlert) {
-                // don't provide paths
-                onClean();
-              } else {
-                onClean(p);
-              }
-            }
-
-            setDialogOpen({
-              clean: false,
-              cleanAlert: false,
-            });
-          }}
-        />
-      ) : (
-        dialogOpen.clean
-      )}
+      {renderCleanDialog()}
 
       <SettingSection headingID="config.tasks.maintenance">
         <div className="setting-group">
diff --git a/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx b/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
index 30e64ebcdf5..1940fa64767 100644
--- a/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
@@ -1,4 +1,5 @@
 import {
+  IconDefinition,
   faMinus,
   faPencilAlt,
   faPlus,
@@ -15,12 +16,29 @@ interface IDirectorySelectionDialogProps {
   animation?: boolean;
   initialPaths?: string[];
   allowEmpty?: boolean;
+  allowPathSelection?: boolean;
+  message?: string | React.ReactNode;
+  header?: string;
+  icon?: IconDefinition;
+  acceptButtonText?: string;
+  acceptButtonVariant?: "danger" | "primary" | "secondary";
   onClose: (paths?: string[]) => void;
 }
 
 export const DirectorySelectionDialog: React.FC<
   IDirectorySelectionDialogProps
-> = ({ animation, allowEmpty = false, initialPaths = [], onClose }) => {
+> = ({
+  animation,
+  allowEmpty = false,
+  initialPaths = [],
+  allowPathSelection = true,
+  message,
+  header,
+  icon = faPencilAlt,
+  acceptButtonText,
+  acceptButtonVariant = "primary",
+  onClose,
+}) => {
   const intl = useIntl();
   const { configuration } = React.useContext(ConfigurationContext);
 
@@ -43,14 +61,15 @@ export const DirectorySelectionDialog: React.FC<
     <ModalComponent
       show
       modalProps={{ animation }}
-      disabled={!allowEmpty && paths.length === 0}
-      icon={faPencilAlt}
-      header={intl.formatMessage({ id: "actions.select_folders" })}
+      disabled={!allowEmpty && allowPathSelection && paths.length === 0}
+      icon={icon}
+      header={header ?? intl.formatMessage({ id: "actions.select_folders" })}
       accept={{
         onClick: () => {
           onClose(paths);
         },
-        text: intl.formatMessage({ id: "actions.confirm" }),
+        text: acceptButtonText ?? intl.formatMessage({ id: "actions.confirm" }),
+        variant: acceptButtonVariant,
       }}
       cancel={{
         onClick: () => onClose(),
@@ -78,19 +97,22 @@ export const DirectorySelectionDialog: React.FC<
           </Row>
         ))}
 
-        <FolderSelect
-          currentDirectory={currentDirectory}
-          setCurrentDirectory={(v) => setCurrentDirectory(v)}
-          defaultDirectories={libraryPaths}
-          appendButton={
-            <Button
-              variant="secondary"
-              onClick={() => addPath(currentDirectory)}
-            >
-              <Icon icon={faPlus} />
-            </Button>
-          }
-        />
+        {allowPathSelection ? (
+          <FolderSelect
+            currentDirectory={currentDirectory}
+            setCurrentDirectory={(v) => setCurrentDirectory(v)}
+            defaultDirectories={libraryPaths}
+            appendButton={
+              <Button
+                variant="secondary"
+                onClick={() => addPath(currentDirectory)}
+              >
+                <Icon icon={faPlus} />
+              </Button>
+            }
+          />
+        ) : undefined}
+        {message}
       </div>
     </ModalComponent>
   );
diff --git a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
index 6069ef433a0..0c861f744f3 100644
--- a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
@@ -19,7 +19,10 @@ import { SettingSection } from "../SettingSection";
 import { BooleanSetting, Setting, SettingGroup } from "../Inputs";
 import { ManualLink } from "src/components/Help/context";
 import { Icon } from "src/components/Shared/Icon";
-import { faQuestionCircle } from "@fortawesome/free-solid-svg-icons";
+import {
+  faQuestionCircle,
+  faTriangleExclamation,
+} from "@fortawesome/free-solid-svg-icons";
 
 interface IAutoTagOptions {
   options: GQL.AutoTagMetadataInput;
@@ -74,17 +77,19 @@ export const LibraryTasks: React.FC = () => {
   const [configureDefaults] = useConfigureDefaults();
 
   const [dialogOpen, setDialogOpenState] = useState({
-    clean: false,
     scan: false,
     autoTag: false,
+    autoTagAlert: false,
     identify: false,
   });
 
   const [scanOptions, setScanOptions] = useState<GQL.ScanMetadataInput>({});
   const [autoTagOptions, setAutoTagOptions] =
     useState<GQL.AutoTagMetadataInput>({
-      performers: ["*"],
-      studios: ["*"],
+      // Updated per issue #3909 so that new users don't accidentally
+      // auto tag their entire library with performers and studios.
+      performers: [],
+      studios: [],
       tags: ["*"],
     });
 
@@ -210,19 +215,44 @@ export const LibraryTasks: React.FC = () => {
   }
 
   function renderAutoTagDialog() {
-    if (!dialogOpen.autoTag) {
-      return;
-    }
-
-    return <DirectorySelectionDialog onClose={onAutoTagDialogClosed} />;
-  }
-
-  function onAutoTagDialogClosed(paths?: string[]) {
-    if (paths) {
-      runAutoTag(paths);
+    if (dialogOpen.autoTagAlert || dialogOpen.autoTag) {
+      return (
+        <DirectorySelectionDialog
+          allowPathSelection={dialogOpen.autoTag}
+          message={
+            <>
+              <p>
+                {intl.formatMessage({
+                  id: "config.tasks.auto_tag_based_on_filenames",
+                })}
+              </p>
+              <Icon icon={faTriangleExclamation} size="xl" />
+              {intl.formatMessage({ id: "config.tasks.auto_tag_warning" })}
+            </>
+          }
+          header={intl.formatMessage({ id: "actions.auto_tag" })}
+          icon={faTriangleExclamation}
+          acceptButtonText={intl.formatMessage({ id: "actions.continue" })}
+          acceptButtonVariant="danger"
+          onClose={(p) => {
+            // undefined means cancelled
+            if (p !== undefined) {
+              if (dialogOpen.autoTagAlert) {
+                // don't provide paths
+                runAutoTag();
+              } else {
+                runAutoTag(p);
+              }
+            }
+
+            setDialogOpen({
+              autoTag: false,
+              autoTagAlert: false,
+            });
+          }}
+        />
+      );
     }
-
-    setDialogOpen({ autoTag: false });
   }
 
   async function runAutoTag(paths?: string[]) {
@@ -337,7 +367,14 @@ export const LibraryTasks: React.FC = () => {
               </ManualLink>
             </>
           }
-          subHeadingID="config.tasks.identify.description"
+          subHeading={
+            <>
+              {intl.formatMessage({ id: "config.tasks.identify.description" })}
+              <br />
+              <Icon icon={faTriangleExclamation} />
+              {intl.formatMessage({ id: "config.tasks.identify.warning" })}
+            </>
+          }
         >
           <Button
             variant="secondary"
@@ -360,7 +397,16 @@ export const LibraryTasks: React.FC = () => {
                 </ManualLink>
               </>
             ),
-            subHeadingID: "config.tasks.auto_tag_based_on_filenames",
+            subHeading: (
+              <>
+                {intl.formatMessage({
+                  id: "config.tasks.auto_tag_based_on_filenames",
+                })}
+                <br />
+                <Icon icon={faTriangleExclamation} />
+                {intl.formatMessage({ id: "config.tasks.auto_tag_warning" })}
+              </>
+            ),
           }}
           topLevel={
             <>
@@ -368,7 +414,7 @@ export const LibraryTasks: React.FC = () => {
                 variant="secondary"
                 type="submit"
                 className="mr-2"
-                onClick={() => runAutoTag()}
+                onClick={() => setDialogOpen({ autoTagAlert: true })}
               >
                 <FormattedMessage id="actions.auto_tag" />
               </Button>
diff --git a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
index fb5646ff571..a08cf756fde 100644
--- a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
+++ b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
@@ -3,6 +3,8 @@ import React, { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { ImageInput } from "./ImageInput";
 import cx from "classnames";
+import { Icon } from "./Icon";
+import { faTriangleExclamation } from "@fortawesome/free-solid-svg-icons";
 
 interface IProps {
   objectName?: string;
@@ -28,6 +30,7 @@ interface IProps {
 export const DetailsEditNavbar: React.FC<IProps> = (props: IProps) => {
   const intl = useIntl();
   const [isDeleteAlertOpen, setIsDeleteAlertOpen] = useState<boolean>(false);
+  const [isAutoTagAlertOpen, setIsAutoTagAlertOpen] = useState<boolean>(false);
 
   function renderEditButton() {
     if (props.isNew) return;
@@ -89,22 +92,58 @@ export const DetailsEditNavbar: React.FC<IProps> = (props: IProps) => {
   function renderAutoTagButton() {
     if (props.isNew || props.isEditing) return;
 
-    if (props.onAutoTag) {
-      return (
-        <div>
+    return (
+      <div>
+        <Button variant="secondary" onClick={() => setIsAutoTagAlertOpen(true)}>
+          <FormattedMessage id="actions.auto_tag" />
+        </Button>
+      </div>
+    );
+  }
+
+  function renderAutoTagAlert() {
+    return (
+      <Modal show={isAutoTagAlertOpen}>
+        <Modal.Header>
+          <Icon icon={faTriangleExclamation} />
+          <span>
+            <FormattedMessage id="actions.auto_tag" />
+          </span>
+        </Modal.Header>
+        <Modal.Body>
+          <p>
+            <FormattedMessage id="config.tasks.auto_tag_based_on_filenames" />
+          </p>
+          <p>
+            <Icon icon={faTriangleExclamation} size="xl" />
+            <FormattedMessage id="config.tasks.auto_tag_warning" />
+          </p>
+          <FormattedMessage id="config.tasks.auto_tag.matching" />
+          <ul>
+            <li>{props.objectName}</li>
+          </ul>
+        </Modal.Body>
+        <Modal.Footer>
           <Button
-            variant="secondary"
+            variant="danger"
             onClick={() => {
               if (props.onAutoTag) {
                 props.onAutoTag();
               }
+              setIsAutoTagAlertOpen(false);
             }}
           >
-            <FormattedMessage id="actions.auto_tag" />
+            <FormattedMessage id="actions.continue" />
           </Button>
-        </div>
-      );
-    }
+          <Button
+            variant="secondary"
+            onClick={() => setIsAutoTagAlertOpen(false)}
+          >
+            <FormattedMessage id="actions.cancel" />
+          </Button>
+        </Modal.Footer>
+      </Modal>
+    );
   }
 
   function renderDeleteAlert() {
@@ -171,6 +210,7 @@ export const DetailsEditNavbar: React.FC<IProps> = (props: IProps) => {
         </div>
       ) : null}
       {renderAutoTagButton()}
+      {renderAutoTagAlert()}
       {props.customButtons}
       {renderSaveButton()}
       {renderDeleteButton()}
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 97bf7817f70..50823c92ef4 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -100,6 +100,7 @@
 .folder-list {
   list-style-type: none;
   margin: 0;
+  padding-bottom: 1rem;
   padding-top: 1rem;
 
   &-item {
@@ -367,6 +368,7 @@ div.react-datepicker {
 
   .react-datepicker__day {
     color: $text-color;
+
     &.react-datepicker__day--disabled {
       color: $text-muted;
     }
@@ -436,6 +438,7 @@ div.react-datepicker {
     }
   }
 }
+
 /* stylelint-enable */
 
 #date-picker-portal .react-datepicker-popper {
diff --git a/ui/v2.5/src/components/Tags/TagList.tsx b/ui/v2.5/src/components/Tags/TagList.tsx
index 98035f12ec0..c747198b6ed 100644
--- a/ui/v2.5/src/components/Tags/TagList.tsx
+++ b/ui/v2.5/src/components/Tags/TagList.tsx
@@ -8,7 +8,7 @@ import {
   PersistanceLevel,
   showWhenSelected,
 } from "../List/ItemList";
-import { Button } from "react-bootstrap";
+import { Button, Modal } from "react-bootstrap";
 import { Link, useHistory } from "react-router-dom";
 import * as GQL from "src/core/generated-graphql";
 import {
@@ -27,7 +27,10 @@ import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
 import { TagCard } from "./TagCard";
 import { ExportDialog } from "../Shared/ExportDialog";
 import { tagRelationHook } from "../../core/tags";
-import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
+import {
+  faTrashAlt,
+  faTriangleExclamation,
+} from "@fortawesome/free-solid-svg-icons";
 
 interface ITagList {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
@@ -63,6 +66,7 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
   const history = useHistory();
   const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
   const [isExportAll, setIsExportAll] = useState(false);
+  const [isAutoTagAlertOpen, setIsAutoTagAlertOpen] = useState(false);
 
   const otherOperations = [
     {
@@ -125,6 +129,7 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
   }
 
   async function onAutoTag(tag: GQL.TagDataFragment) {
+    setIsAutoTagAlertOpen(false);
     if (!tag) return;
     try {
       await mutateMetadataAutoTag({ tags: [tag.id] });
@@ -185,6 +190,45 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
       }
     }
 
+    function renderAutoTagButton() {
+      return (
+        <Button
+          variant="secondary"
+          className="tag-list-button"
+          onClick={() => setIsAutoTagAlertOpen(true)}
+        >
+          <FormattedMessage id="actions.auto_tag" />
+        </Button>
+      );
+    }
+
+    function renderAutoTagAlert(tag: GQL.TagDataFragment) {
+      return (
+        <Modal show={isAutoTagAlertOpen}>
+          <Modal.Header>
+            <Icon icon={faTriangleExclamation} />
+            <span>
+              <FormattedMessage id="actions.confirm" />
+            </span>
+          </Modal.Header>
+          <Modal.Body>
+            <FormattedMessage id="config.tasks.auto_tag_based_on_filenames" />
+          </Modal.Body>
+          <Modal.Footer>
+            <Button variant="danger" onClick={() => onAutoTag(tag)}>
+              <FormattedMessage id="actions.auto_tag" />
+            </Button>
+            <Button
+              variant="secondary"
+              onClick={() => setIsAutoTagAlertOpen(false)}
+            >
+              <FormattedMessage id="actions.cancel" />
+            </Button>
+          </Modal.Footer>
+        </Modal>
+      );
+    }
+
     function renderTags() {
       if (!result.data?.findTags) return;
 
@@ -234,13 +278,8 @@ export const TagList: React.FC<ITagList> = ({ filterHook, alterQuery }) => {
               <Link to={`/tags/${tag.id}`}>{tag.name}</Link>
 
               <div className="ml-auto">
-                <Button
-                  variant="secondary"
-                  className="tag-list-button"
-                  onClick={() => onAutoTag(tag)}
-                >
-                  <FormattedMessage id="actions.auto_tag" />
-                </Button>
+                {renderAutoTagButton()}
+                {renderAutoTagAlert(tag)}
                 <Button variant="secondary" className="tag-list-button">
                   <Link
                     to={NavUtils.makeTagScenesUrl(tag)}
diff --git a/ui/v2.5/src/docs/en/Manual/Identify.md b/ui/v2.5/src/docs/en/Manual/Identify.md
index 8d0b3af2ea4..77014efe31f 100644
--- a/ui/v2.5/src/docs/en/Manual/Identify.md
+++ b/ui/v2.5/src/docs/en/Manual/Identify.md
@@ -1,11 +1,13 @@
 # Identify
 
-This task iterates through your Scenes and attempts to identify the scene using a selection of scraping sources.
+This task iterates through your Scenes and attempts to identify the scene using a selection of scraping sources. It will skip scenes marked as organized.
 
 This task accepts one or more scraper sources. Valid scraper sources for the Identify task are stash-box instances, and scene scrapers which support scraping via Scene Fragment. The order of the sources may be rearranged.
 
 For each Scene, the Identify task iterates through the scraper sources, in the order provided, and tries to identify the scene using each source. If a result is found in a source, then the Scene is updated, and no further sources are checked for that scene.
 
+Some incorrect matches can be expected and they cannot be undone. It may also be hard to figure out which ones they are.
+
 ## Options
 
 The following options can be set:
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index 6775e71ca66..7ae0cc6cea4 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -415,9 +415,11 @@
       "anonymising_database": "Anonymising database",
       "auto_tag": {
         "auto_tagging_all_paths": "Auto Tagging all paths",
-        "auto_tagging_paths": "Auto Tagging the following paths"
+        "auto_tagging_paths": "Auto Tagging the following paths",
+        "matching": "Matching:"
       },
-      "auto_tag_based_on_filenames": "Auto-tag content based on file paths.",
+      "auto_tag_based_on_filenames": "Auto Tag analyzes your file paths and attempts to find matches with your existing metadata (tags, studios, or performers).",
+      "auto_tag_warning": "This process cannot be undone and may match incorrect false positives, particularly with non-unique tags and names.",
       "auto_tagging": "Auto Tagging",
       "backing_up_database": "Backing up database",
       "backup_and_download": "Performs a backup of the database and downloads the resulting file.",
@@ -457,6 +459,7 @@
         "identifying_from_paths": "Identifying scenes from the following paths",
         "identifying_scenes": "Identifying {num} {scene}",
         "include_male_performers": "Include male performers",
+        "organized": "Scenes marked as organized will be skipped by Identify and Autotag",
         "set_cover_images": "Set cover images",
         "set_organized": "Set organised flag",
         "skip_multiple_matches": "Skip matches that have more than one result",
@@ -470,7 +473,8 @@
         "tag_skipped_matches": "Tag skipped matches with",
         "tag_skipped_matches_tooltip": "Create a tag like 'Identify: Multiple Matches' that you can filter for in the Scene Tagger view and choose the correct match by hand",
         "tag_skipped_performers": "Tag skipped performers with",
-        "tag_skipped_performer_tooltip": "Create a tag like 'Identify: Single Name Performer' that you can filter for in the Scene Tagger view and choose how you want to handle these performers"
+        "tag_skipped_performer_tooltip": "Create a tag like 'Identify: Single Name Performer' that you can filter for in the Scene Tagger view and choose how you want to handle these performers",
+        "warning": "Some incorrect matches can be expected and they cannot be undone."
       },
       "import_from_exported_json": "Import from exported JSON in the metadata directory. Wipes the existing database.",
       "incremental_import": "Incremental import from a supplied export zip file.",