diff --git a/packages/core-app-api/src/app/AppManager.tsx b/packages/core-app-api/src/app/AppManager.tsx
index a923b4131e..141de0aab2 100644
--- a/packages/core-app-api/src/app/AppManager.tsx
+++ b/packages/core-app-api/src/app/AppManager.tsx
@@ -50,7 +50,7 @@ import {
   SubRouteRef,
   ExternalRouteRef,
 } from '@backstage/core-plugin-api';
-import { GuestUserIdentity } from '../apis/implementations/IdentityApi/GuestUserIdentity';
+import { GuestUserIdentity } from '@backstage/core-components';
 import { ApiFactoryRegistry, ApiResolver } from '../apis/system';
 import {
   childDiscoverer,
diff --git a/packages/core-app-api/src/apis/implementations/IdentityApi/GuestUserIdentity.ts b/packages/core-components/src/layout/SignInPage/GuestUserIdentity.ts
similarity index 100%
rename from packages/core-app-api/src/apis/implementations/IdentityApi/GuestUserIdentity.ts
rename to packages/core-components/src/layout/SignInPage/GuestUserIdentity.ts
diff --git a/packages/core-app-api/src/apis/implementations/IdentityApi/LegacyUserIdentity.ts b/packages/core-components/src/layout/SignInPage/LegacyUserIdentity.ts
similarity index 100%
rename from packages/core-app-api/src/apis/implementations/IdentityApi/LegacyUserIdentity.ts
rename to packages/core-components/src/layout/SignInPage/LegacyUserIdentity.ts
diff --git a/packages/core-components/src/layout/SignInPage/customProvider.tsx b/packages/core-components/src/layout/SignInPage/customProvider.tsx
index 77bde5223c..a6e46aee6a 100644
--- a/packages/core-components/src/layout/SignInPage/customProvider.tsx
+++ b/packages/core-components/src/layout/SignInPage/customProvider.tsx
@@ -26,7 +26,7 @@ import isEmpty from 'lodash/isEmpty';
 import { InfoCard } from '../InfoCard/InfoCard';
 import { ProviderComponent, ProviderLoader, SignInProvider } from './types';
 import { GridItem } from './styles';
-import { LegacyUserIdentity } from '@backstage/core-app-api/src/apis/implementations/IdentityApi/LegacyUserIdentity';
+import { LegacyUserIdentity } from './LegacyUserIdentity';
 
 // accept base64url format according to RFC7515 (https://tools.ietf.org/html/rfc7515#section-3)
 const ID_TOKEN_REGEX = /^[a-z0-9_\-]+\.[a-z0-9_\-]+\.[a-z0-9_\-]+$/i;
diff --git a/packages/core-components/src/layout/SignInPage/guestProvider.tsx b/packages/core-components/src/layout/SignInPage/guestProvider.tsx
index 9e0326c7df..b2370a98d5 100644
--- a/packages/core-components/src/layout/SignInPage/guestProvider.tsx
+++ b/packages/core-components/src/layout/SignInPage/guestProvider.tsx
@@ -20,7 +20,7 @@ import Button from '@material-ui/core/Button';
 import { InfoCard } from '../InfoCard/InfoCard';
 import { GridItem } from './styles';
 import { ProviderComponent, ProviderLoader, SignInProvider } from './types';
-import { GuestUserIdentity } from '@backstage/core-app-api/src/apis/implementations/IdentityApi/GuestUserIdentity';
+import { GuestUserIdentity } from './GuestUserIdentity';
 
 const Component: ProviderComponent = ({ onSignInSuccess }) => (
   <GridItem>
diff --git a/packages/core-components/src/layout/SignInPage/index.ts b/packages/core-components/src/layout/SignInPage/index.ts
index caa8506399..176cba96a6 100644
--- a/packages/core-components/src/layout/SignInPage/index.ts
+++ b/packages/core-components/src/layout/SignInPage/index.ts
@@ -18,3 +18,5 @@ export type { SignInProviderConfig } from './types';
 export { SignInPage } from './SignInPage';
 export type { SignInPageClassKey } from './styles';
 export type { CustomProviderClassKey } from './customProvider';
+export { GuestUserIdentity } from './GuestUserIdentity';
+export { LegacyUserIdentity } from './LegacyUserIdentity';