diff --git a/frontend/web/components/App.js b/frontend/web/components/App.js
index 21e5bb93720f..48242f0bf175 100644
--- a/frontend/web/components/App.js
+++ b/frontend/web/components/App.js
@@ -299,7 +299,8 @@ const App = class extends Component {
}
if (
AccountStore.getOrganisation() &&
- AccountStore.getOrganisation().block_access_to_admin
+ AccountStore.getOrganisation().block_access_to_admin &&
+ pathname !== '/organisations'
) {
return
}
diff --git a/frontend/web/components/Blocked.js b/frontend/web/components/Blocked.js
index cbc8fc3a9f91..540296ec2798 100644
--- a/frontend/web/components/Blocked.js
+++ b/frontend/web/components/Blocked.js
@@ -1,6 +1,7 @@
import React from 'react'
import ConfigProvider from 'common/providers/ConfigProvider'
import Payment from './modals/Payment'
+import BlockedOrgInfo from './BlockedOrgInfo'
const Blocked = class extends React.Component {
static contextTypes = {
@@ -19,41 +20,31 @@ const Blocked = class extends React.Component {
{!Utils.isSaas() ? (
Please get in touch
- Your organisation has been disabled. Please get in touch so we can
- discuss enabling your account.
- {
- <>
- {' '}
-
- support@flagsmith.com
-
- .
- >
- }
+
+ Your organisation has been disabled. Please contact Flagsmith
+ support at
+ {
+ <>
+ {' '}
+
+ support@flagsmith.com
+
+ .
+ >
+ }
+
+
) : (
{
<>
-
-
-
>
}
diff --git a/frontend/web/components/BlockedOrgInfo.tsx b/frontend/web/components/BlockedOrgInfo.tsx
new file mode 100644
index 000000000000..492a80ecf6c3
--- /dev/null
+++ b/frontend/web/components/BlockedOrgInfo.tsx
@@ -0,0 +1,25 @@
+import React from 'react'
+import AccountStore from 'common/stores/account-store'
+import AppActions from 'common/dispatcher/app-actions'
+
+export default function BlockedOrgInfo() {
+ return (
+