diff --git a/src/main/kotlin/fi/hsl/jore4/auth/audit/LoginAuditRepository.kt b/src/main/kotlin/fi/hsl/jore4/auth/audit/LoginAuditRepository.kt
index 5c0a6d5..bc24211 100644
--- a/src/main/kotlin/fi/hsl/jore4/auth/audit/LoginAuditRepository.kt
+++ b/src/main/kotlin/fi/hsl/jore4/auth/audit/LoginAuditRepository.kt
@@ -1,5 +1,6 @@
 package fi.hsl.jore4.auth.audit
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 
@@ -7,4 +8,5 @@ import org.springframework.stereotype.Repository
  * Repository for login records.
  */
 @Repository
+@ConditionalOnProperty(prefix = "session", name = ["enabled"], havingValue = "true")
 interface LoginAuditRepository : JpaRepository<LoginAudit, Long>
diff --git a/src/main/kotlin/fi/hsl/jore4/auth/audit/LoginAuditService.kt b/src/main/kotlin/fi/hsl/jore4/auth/audit/LoginAuditService.kt
index a25a79b..e8d8884 100644
--- a/src/main/kotlin/fi/hsl/jore4/auth/audit/LoginAuditService.kt
+++ b/src/main/kotlin/fi/hsl/jore4/auth/audit/LoginAuditService.kt
@@ -2,17 +2,18 @@ package fi.hsl.jore4.auth.audit
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 /**
  * Service for logging login events.
- * Only enabled when JPA is available.
  */
 @Service
-@ConditionalOnBean(LoginAuditRepository::class)
+@ConditionalOnProperty(prefix = "session", name = ["enabled"], havingValue = "true")
 open class LoginAuditService(
+    @Autowired(required = true)
     private val loginAuditRepository: LoginAuditRepository
 ) {
     companion object {