diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js
index 7475084c8..60eff3eb8 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js
@@ -41,6 +41,7 @@ class EditDownloadClientModalContent extends Component {
 
     const {
       id,
+      implementationName,
       name,
       enable,
       fields,
@@ -50,7 +51,7 @@ class EditDownloadClientModalContent extends Component {
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {id ? 'Edit DownloadClient' : 'Add DownloadClient'}
+          {`${id ? 'Edit' : 'Add'} Download Client - ${implementationName}`}
         </ModalHeader>
 
         <ModalBody>
@@ -61,7 +62,7 @@ class EditDownloadClientModalContent extends Component {
 
           {
             !isFetching && !!error &&
-              <div>Unable to add a new downloadClient, please try again.</div>
+              <div>Unable to add a new download client, please try again.</div>
           }
 
           {
diff --git a/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js b/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js
index a0c690dad..188160e4d 100644
--- a/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js
+++ b/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js
@@ -35,6 +35,7 @@ function EditIndexerModalContent(props) {
 
   const {
     id,
+    implementationName,
     name,
     enableRss,
     enableAutomaticSearch,
@@ -47,7 +48,7 @@ function EditIndexerModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {id ? 'Edit Indexer' : 'Add Indexer'}
+        {`${id ? 'Edit' : 'Add'} Indexer - ${implementationName}`}
       </ModalHeader>
 
       <ModalBody>
diff --git a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js
index 4c84adce3..fa8742503 100644
--- a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js
+++ b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js
@@ -36,6 +36,7 @@ function EditNotificationModalContent(props) {
 
   const {
     id,
+    implementationName,
     name,
     onGrab,
     onDownload,
@@ -55,7 +56,7 @@ function EditNotificationModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {id ? 'Edit Notification' : 'Add Notification'}
+        {`${id ? 'Edit' : 'Add'} Connection - ${implementationName}`}
       </ModalHeader>
 
       <ModalBody>
diff --git a/frontend/src/Store/Selectors/createProviderSettingsSelector.js b/frontend/src/Store/Selectors/createProviderSettingsSelector.js
index bd530bc24..2c4816a17 100644
--- a/frontend/src/Store/Selectors/createProviderSettingsSelector.js
+++ b/frontend/src/Store/Selectors/createProviderSettingsSelector.js
@@ -53,8 +53,8 @@ function createProviderSettingsSelector(sectionName) {
         isSaving,
         saveError,
         isTesting,
-        item: settings.settings,
-        ...settings
+        ...settings,
+        item: settings.settings
       };
     }
   );
diff --git a/frontend/src/Store/Selectors/selectSettings.js b/frontend/src/Store/Selectors/selectSettings.js
index 74e5444c9..3e30478b7 100644
--- a/frontend/src/Store/Selectors/selectSettings.js
+++ b/frontend/src/Store/Selectors/selectSettings.js
@@ -29,6 +29,13 @@ function selectSettings(item, pendingChanges, saveError) {
       return result;
     }
 
+    // Return a flattened value
+    if (key === 'implementationName') {
+      result.implementationName = item[key];
+
+      return result;
+    }
+
     const setting = {
       value: item[key],
       errors: _.map(_.remove(validationFailures, (failure) => {