diff --git a/libs/dsb-client-gateway/ui/login/src/lib/LoginStatus/LoginStatus.tsx b/libs/dsb-client-gateway/ui/login/src/lib/LoginStatus/LoginStatus.tsx
index dac2cbdce..080176ca6 100644
--- a/libs/dsb-client-gateway/ui/login/src/lib/LoginStatus/LoginStatus.tsx
+++ b/libs/dsb-client-gateway/ui/login/src/lib/LoginStatus/LoginStatus.tsx
@@ -1,42 +1,9 @@
-import { RoleStatus } from '@dsb-client-gateway/dsb-client-gateway/identity/models';
-import { AccountStatusEnum } from '../check-account-status/check-account-status';
-import InsufficientFund from './InsufficientFund/InsufficientFund';
-import EnrolForRoleContainer from './EnrolForRoleContainer/EnrolForRoleContainer';
-import RequestingEnrolment from './RequestingEnrolment/RequestingEnrolment';
-import AwaitingSyncing from './AwaitingSyncing/AwaitingSyncing';
-import ResetPrivateKey from '../ResetPrivateKey/ResetPrivateKey';
-import LoginForm from '../LoginForm/LoginForm';
-import { usePrivateKey } from '../Login.effects';
 import LoadingInfo from '../LoadingInfo/LoadingInfo';
+import { useLoginStatus } from './RequestingEnrolment/LoginStatus.effects';
 
 
 export function LoginStatus() {
-  const {isLoading, submit, status} = usePrivateKey();
-
-  const onSubmit = (privateKey: string) => {
-    submit(privateKey);
-  };
-
-  const statusFactory = () => {
-    switch (status) {
-      case AccountStatusEnum.NotSetPrivateKey:
-        return <LoginForm onPrivateKeySubmit={onSubmit} />;
-      case AccountStatusEnum.InsufficientFund:
-        return <InsufficientFund/>;
-      case RoleStatus.NOT_ENROLLED:
-        return <EnrolForRoleContainer/>;
-      case RoleStatus.AWAITING_APPROVAL:
-        return <RequestingEnrolment/>;
-      case RoleStatus.APPROVED:
-        return <AwaitingSyncing/>;
-      default:
-        return (
-          <>
-            <div>Ops! Something went wrong!</div>
-            <ResetPrivateKey/>
-          </>);
-    }
-  };
+  const {isLoading, statusFactory} = useLoginStatus();
 
   return (
     <>
diff --git a/libs/dsb-client-gateway/ui/login/src/lib/LoginStatus/RequestingEnrolment/LoginStatus.effects.tsx b/libs/dsb-client-gateway/ui/login/src/lib/LoginStatus/RequestingEnrolment/LoginStatus.effects.tsx
new file mode 100644
index 000000000..074dc50a1
--- /dev/null
+++ b/libs/dsb-client-gateway/ui/login/src/lib/LoginStatus/RequestingEnrolment/LoginStatus.effects.tsx
@@ -0,0 +1,40 @@
+import { usePrivateKey } from '../../Login.effects';
+import { AccountStatusEnum } from '../../check-account-status/check-account-status';
+import LoginForm from '../../LoginForm/LoginForm';
+import InsufficientFund from '../InsufficientFund/InsufficientFund';
+import { RoleStatus } from '@dsb-client-gateway/dsb-client-gateway/identity/models';
+import EnrolForRoleContainer from '../EnrolForRoleContainer/EnrolForRoleContainer';
+import RequestingEnrolment from './RequestingEnrolment';
+import AwaitingSyncing from '../AwaitingSyncing/AwaitingSyncing';
+import ResetPrivateKey from '../../ResetPrivateKey/ResetPrivateKey';
+
+export const useLoginStatus = () => {
+  const {isLoading, submit, status} = usePrivateKey();
+
+  const privateKeyHandler = (privateKey: string) => {
+    submit(privateKey);
+  };
+
+  const statusFactory = () => {
+    switch (status) {
+      case AccountStatusEnum.NotSetPrivateKey:
+        return <LoginForm onPrivateKeySubmit={privateKeyHandler} />;
+      case AccountStatusEnum.InsufficientFund:
+        return <InsufficientFund/>;
+      case RoleStatus.NOT_ENROLLED:
+        return <EnrolForRoleContainer/>;
+      case RoleStatus.AWAITING_APPROVAL:
+        return <RequestingEnrolment/>;
+      case RoleStatus.APPROVED:
+        return <AwaitingSyncing/>;
+      default:
+        return (
+          <>
+            <div>Ops! Something went wrong!</div>
+            <ResetPrivateKey/>
+          </>);
+    }
+  };
+
+  return {statusFactory, isLoading}
+}