diff --git a/apps/skolplattformen-app/components/login.component.tsx b/apps/skolplattformen-app/components/login.component.tsx
index 793d5592e..025afdbbc 100644
--- a/apps/skolplattformen-app/components/login.component.tsx
+++ b/apps/skolplattformen-app/components/login.component.tsx
@@ -47,25 +47,11 @@ const BankId = () => (
 const FrejaEid = () => (
   <Image
     style={themedStyles.icon}
-   source={require('../assets/freja_eid_low.png')}
+    source={require('../assets/freja_eid_low.png')}
     accessibilityIgnoresInvertColors
   />
 )
 
-
-
-interface Logins {
-  BANKID_SAME_DEVICE: number
-  BANKID_ANOTHER_DEVICE: number
-  TEST_USER: number
-}
-
-const LoginMethods: Logins = {
-  BANKID_SAME_DEVICE: 0,
-  BANKID_ANOTHER_DEVICE: 2,
-  TEST_USER: 3,
-}
-
 export const Login = () => {
   const { api } = useApi()
   const [cancelLoginRequest, setCancelLoginRequest] = useState<
@@ -84,6 +70,7 @@ export const Login = () => {
   const loginBankIdSameDeviceWithoutId = useFeature(
     'LOGIN_BANK_ID_SAME_DEVICE_WITHOUT_ID'
   )
+  const loginWithFrejaEnabled = useFeature('LOGIN_FREJA_EID')
   const { currentSchoolPlatform, changeSchoolPlatform } = useContext(
     SchoolPlatformContext
   )
@@ -95,10 +82,14 @@ export const Login = () => {
   const loginMethods = [
     { id: 'thisdevice', title: t('auth.bankid.OpenOnThisDevice') },
     { id: 'otherdevice', title: t('auth.bankid.OpenOnAnotherDevice') },
-    { id: 'testuser', title: t('auth.loginAsTestUser') },
     { id: 'freja', title: t('auth.freja.OpenOnThisDevice') },
+    { id: 'testuser', title: t('auth.loginAsTestUser') },
   ] as const
 
+  if (loginMethodId === 'freja' && !loginWithFrejaEnabled) {
+    setLoginMethodId('thisdevice')
+  }
+
   const loginHandler = async () => {
     const user = await api.getUser()
     await AppStorage.clearPersonalData(user)
@@ -112,10 +103,10 @@ export const Login = () => {
     }
   }, [api])
 
-  const LoginProviderImage  = () => {
+  const LoginProviderImage = () => {
     //if(loginMethodId == 'testuser') return undefined
-    if(loginMethodId == 'freja') return FrejaEid()
-    return BankId() 
+    if (loginMethodId == 'freja') return FrejaEid()
+    return BankId()
   }
 
   const getSchoolPlatformName = () => {
@@ -292,7 +283,11 @@ export const Login = () => {
             {t('auth.chooseLoginMethod')}
           </Text>
           <List
-            data={loginMethods}
+            data={
+              loginWithFrejaEnabled
+                ? loginMethods
+                : loginMethods.filter((f) => f.id != 'freja')
+            }
             ItemSeparatorComponent={Divider}
             renderItem={({ item, index }) => (
               <ListItem
diff --git a/libs/api-hjarntorget/lib/features.ts b/libs/api-hjarntorget/lib/features.ts
index 681f2f4b9..b0e530222 100644
--- a/libs/api-hjarntorget/lib/features.ts
+++ b/libs/api-hjarntorget/lib/features.ts
@@ -2,6 +2,7 @@ import { Features } from '@skolplattformen/api'
 
 export const features: Features = {
   LOGIN_BANK_ID_SAME_DEVICE_WITHOUT_ID: false,
+  LOGIN_FREJA_EID: false,
   FOOD_MENU: false,
   CLASS_LIST: false,
 }
diff --git a/libs/api-skolplattformen/lib/features.ts b/libs/api-skolplattformen/lib/features.ts
index 0e9dfce49..0a6e96c53 100644
--- a/libs/api-skolplattformen/lib/features.ts
+++ b/libs/api-skolplattformen/lib/features.ts
@@ -2,6 +2,7 @@ import { Features } from '@skolplattformen/api'
 
 export const features: Features = {
   LOGIN_BANK_ID_SAME_DEVICE_WITHOUT_ID: true,
+  LOGIN_FREJA_EID: true,
   FOOD_MENU: true,
   CLASS_LIST: true,
 }
diff --git a/libs/api/lib/features.ts b/libs/api/lib/features.ts
index 752066748..aafaf638f 100644
--- a/libs/api/lib/features.ts
+++ b/libs/api/lib/features.ts
@@ -1,7 +1,9 @@
 export interface Features {
-  LOGIN_BANK_ID_SAME_DEVICE_WITHOUT_ID: boolean
+  LOGIN_BANK_ID_SAME_DEVICE_WITHOUT_ID: boolean,
+  LOGIN_FREJA_EID: boolean,
   FOOD_MENU: boolean,
-  CLASS_LIST: boolean
+  CLASS_LIST: boolean,
+  
 }
 
 export type FeatureType = keyof Features