diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt
index d29ccd2f..a3ac0009 100644
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt
+++ b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/Configuration.kt
@@ -22,7 +22,7 @@ class WebConfig: WebMvcConfigurer {
     override fun addCorsMappings(registry: CorsRegistry) {
         registry.addMapping("/**")
             .allowedOrigins("localhost", "*://localhost:3000", "localhost:80")
-            .allowCredentials(false)
+            .allowCredentials(true)
     }
 
     override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
@@ -32,13 +32,14 @@ class WebConfig: WebMvcConfigurer {
     }
 
     override fun addViewControllers(registry: ViewControllerRegistry) {
-        // Sørger for at alle ikke-API-ruter sendes til React sin index.html
-        registry.addViewController("/{spring:[^api].*}")
+        // Endrer på denne linjen for å være mer presis
+        registry.addViewController("/")
             .setViewName("forward:/index.html")
+
+        // Denne fanger andre ruter som ikke starter med `/api`
         registry.addViewController("/**/{spring:[^api].*}")
             .setViewName("forward:/index.html")
     }
-
     override fun configurePathMatch(configurer: PathMatchConfigurer) {
         configurer.addPathPrefix("/api", HandlerTypePredicate.forAnnotation(RestController::class.java))
     }
diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/EventExecutionOrderService.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/EventExecutionOrderService.kt
index b28cf0f3..30530270 100644
--- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/EventExecutionOrderService.kt
+++ b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/EventExecutionOrderService.kt
@@ -12,7 +12,7 @@ import org.springframework.scheduling.annotation.EnableScheduling
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Service
 
-@Service
+//@Service
 @EnableScheduling
 class EventExecutionOrderService(
     @Autowired eventsManager: EventsManager