diff --git a/.docs/changelog.md b/.docs/changelog.md
index 3afdd9dac6e2db1703d72f8e7f4a9080f4c47f5f..03fde813b6ccda1315cf7be564e004cd6a8ebd56 100644
--- a/.docs/changelog.md
+++ b/.docs/changelog.md
@@ -4,6 +4,10 @@ author: Martin Weise
 
 ## v1.8.2 (2025-04-23)
 
+#### Fixes
+
+* Fixed a bug in the UI where the resource status was displayed as identifier when a draft identifier has been created.
+
 #### Features
 
 * Added structured logging through the `fluentd` protocol via the lightweight fluentbit in a 
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/ac/tuwien/ifs/dbrepo/repository/IdentifierRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/ac/tuwien/ifs/dbrepo/repository/IdentifierRepository.java
index 4011a8d1683329af5181d387b6031cefa8fd461b..d93cd3c75f35525f694f8b3ffb905d5ffdea136c 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/ac/tuwien/ifs/dbrepo/repository/IdentifierRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/ac/tuwien/ifs/dbrepo/repository/IdentifierRepository.java
@@ -11,6 +11,9 @@ import java.util.UUID;
 @Repository
 public interface IdentifierRepository extends JpaRepository<Identifier, UUID> {
 
+    @NotNull
+    List<Identifier> findAll();
+
     /**
      * Finds identifiers by given database id.
      *
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/UserServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/UserServiceImpl.java
index f93dacc21c112d9bdbd1be6f511c0d89829ea836..351b61e82de310ccdef35830986dd8f4d9ee1f7e 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/UserServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/UserServiceImpl.java
@@ -13,6 +13,7 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -33,11 +34,13 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
+    @Transactional(readOnly = true)
     public List<User> findAll() {
         return userRepository.findAll();
     }
 
     @Override
+    @Transactional(readOnly = true)
     public User findByUsername(String username) throws UserNotFoundException {
         final Optional<User> optional = userRepository.findByUsername(username);
         if (optional.isEmpty()) {
@@ -48,11 +51,13 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
+    @Transactional(readOnly = true)
     public List<User> findAllInternalUsers() {
         return userRepository.findAllInternal();
     }
 
     @Override
+    @Transactional(readOnly = true)
     public User findById(UUID id) throws UserNotFoundException {
         final Optional<User> optional = userRepository.findById(id);
         if (optional.isEmpty()) {
@@ -63,6 +68,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
+    @Transactional
     public User create(CreateUserDto data) {
         /* create at authentication service */
         final String passwordHash = "*" + DigestUtils.sha1Hex(DigestUtils.sha1(RandomStringUtils.randomAlphabetic(40)
@@ -86,6 +92,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
+    @Transactional
     public User modify(User user, UserUpdateDto data) throws UserNotFoundException, AuthServiceException {
         user.setFirstname(data.getFirstname());
         user.setLastname(data.getLastname());
diff --git a/dbrepo-ui/components/ResourceStatus.vue b/dbrepo-ui/components/ResourceStatus.vue
index 22718ff5833263faa09c1bfd741747f785a6c885..2a28a8c4713871efed8d77a8d3865a23d9336d7f 100644
--- a/dbrepo-ui/components/ResourceStatus.vue
+++ b/dbrepo-ui/components/ResourceStatus.vue
@@ -16,7 +16,11 @@
 </template>
 
 <script>
+<<<<<<< Updated upstream
 import { useCacheStore } from '~/stores/cache.js';
+=======
+import { useCacheStore } from '@/stores/cache.js'
+>>>>>>> Stashed changes
 
 export default {
   props: {
@@ -65,7 +69,11 @@ export default {
       return this.cacheStore.getUser
     },
     hasIdentifier () {
+<<<<<<< Updated upstream
       if (!this.resource.identifiers) {
+=======
+      if (!this.resource.identifiers || this.resource.identifiers.length === 0) {
+>>>>>>> Stashed changes
         return false
       }
       if (!this.cacheUser) {