diff --git a/app/views/katello/api/v2/flatpak_remotes/index.json.rabl b/app/views/katello/api/v2/flatpak_remotes/index.json.rabl
index bf1da38597f..d5b2f671d80 100644
--- a/app/views/katello/api/v2/flatpak_remotes/index.json.rabl
+++ b/app/views/katello/api/v2/flatpak_remotes/index.json.rabl
@@ -5,7 +5,9 @@ extends 'katello/api/v2/flatpak_remotes/permissions'
 
 node :has_redhat_flatpak_remote do
   User.as_anonymous_admin do
-    ::Katello::FlatpakRemote.unscoped.where("url LIKE ?", "%flatpaks.redhat.io%").exists?
+    query = ::Katello::FlatpakRemote.where("url LIKE ?", "%flatpaks.redhat.io%")
+    query = query.where(organization_id: @organization.id) if @organization
+    query.exists?
   end
 end
 
diff --git a/webpack/scenes/FlatpakRemotes/CreateEdit/CreateFlatpakRemoteModal.js b/webpack/scenes/FlatpakRemotes/CreateEdit/CreateFlatpakRemoteModal.js
index 7f171d7bbca..65535043735 100644
--- a/webpack/scenes/FlatpakRemotes/CreateEdit/CreateFlatpakRemoteModal.js
+++ b/webpack/scenes/FlatpakRemotes/CreateEdit/CreateFlatpakRemoteModal.js
@@ -7,7 +7,7 @@ import FlatpakRemotesForm from './FlatpakRemoteform';
 const CreateFlatpakModal = ({ show, setIsOpen, hasRedhatRemote }) => (
   <Modal
     ouiaId="create-flatpak-modal"
-    title={__('Create Flatpak Remote')}
+    title={__('Create Flatpak remote')}
     variant={ModalVariant.medium}
     isOpen={show}
     onClose={() => { setIsOpen(false); }}
diff --git a/webpack/scenes/FlatpakRemotes/CreateEdit/EditFlatpakRemotesModal.js b/webpack/scenes/FlatpakRemotes/CreateEdit/EditFlatpakRemotesModal.js
index 4cce658d7bc..85ca345978b 100644
--- a/webpack/scenes/FlatpakRemotes/CreateEdit/EditFlatpakRemotesModal.js
+++ b/webpack/scenes/FlatpakRemotes/CreateEdit/EditFlatpakRemotesModal.js
@@ -7,7 +7,7 @@ import FlatpakRemotesForm from './FlatpakRemoteform';
 const EditFlatpakModal = ({ show, setIsOpen, remoteData }) => (
   <Modal
     ouiaId="edit-flatpak-modal"
-    title={__('Edit Flatpak Remote')}
+    title={__('Edit Flatpak remote')}
     variant={ModalVariant.medium}
     isOpen={show}
     onClose={() => { setIsOpen(false); }}
diff --git a/webpack/scenes/FlatpakRemotes/CreateEdit/FlatpakRemoteform.js b/webpack/scenes/FlatpakRemotes/CreateEdit/FlatpakRemoteform.js
index 9e3f9060c8f..8e64127e0fc 100644
--- a/webpack/scenes/FlatpakRemotes/CreateEdit/FlatpakRemoteform.js
+++ b/webpack/scenes/FlatpakRemotes/CreateEdit/FlatpakRemoteform.js
@@ -127,7 +127,11 @@ const FlatpakRemotesForm = ({ setModalOpen, remoteData, hasRedhatRemote }) => {
         actionClose={<AlertActionCloseButton onClose={() => setAlertDismissed(true)} />}
         actionLinks={
           <React.Fragment>
-            <AlertActionLink onClick={() => setUrl('https://flatpaks.redhat.io/rhel')}>
+            <AlertActionLink onClick={() => {
+              setUrl('https://flatpaks.redhat.io/rhel');
+              setName(__('Red Hat remote'));
+            }}
+            >
               {__('Add Red Hat flatpak remote')}
             </AlertActionLink>
             <AlertActionLink component="a" href="https://access.redhat.com/terms-based-registry/" target="_blank">