diff --git a/domain/src/main/java/org/fao/geonet/repository/UserRepositoryCustom.java b/domain/src/main/java/org/fao/geonet/repository/UserRepositoryCustom.java
index 65e3162a22e..21148980e14 100644
--- a/domain/src/main/java/org/fao/geonet/repository/UserRepositoryCustom.java
+++ b/domain/src/main/java/org/fao/geonet/repository/UserRepositoryCustom.java
@@ -61,7 +61,7 @@ public interface UserRepositoryCustom {
      */
     @Nonnull
     List<Pair<Integer, User>> findAllByGroupOwnerNameAndProfile(@Nonnull Collection<Integer> metadataIds,
-                                                                @Nullable Profile profil);
+                                                                @Nullable Profile profile);
 
     /**
      * Find all the users that own at least one metadata element.
diff --git a/domain/src/main/java/org/fao/geonet/repository/UserRepositoryCustomImpl.java b/domain/src/main/java/org/fao/geonet/repository/UserRepositoryCustomImpl.java
index 4c8b54ad482..4585548d9fe 100644
--- a/domain/src/main/java/org/fao/geonet/repository/UserRepositoryCustomImpl.java
+++ b/domain/src/main/java/org/fao/geonet/repository/UserRepositoryCustomImpl.java
@@ -47,36 +47,37 @@
 public class UserRepositoryCustomImpl implements UserRepositoryCustom {
 
     @PersistenceContext
-    private EntityManager _entityManager;
+    private EntityManager entityManager;
 
     @Override
     public User findOne(final String userId) {
-        return _entityManager.find(User.class, Integer.valueOf(userId));
+        return entityManager.find(User.class, Integer.valueOf(userId));
     }
 
     @Override
-    public User findOneByEmail(final String email) {
-        CriteriaBuilder cb = _entityManager.getCriteriaBuilder();
+    public User findOneByEmail(@Nonnull final String email) {
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
         CriteriaQuery<User> query = cb.createQuery(User.class);
         Root<User> root = query.from(User.class);
         Join<User, String> joinedEmailAddresses = root.join(User_.emailAddresses);
 
         // Case in-sensitive email search
-        query.where( cb.equal(cb.lower(joinedEmailAddresses), email.toLowerCase()));
-        final List<User> resultList = _entityManager.createQuery(query).getResultList();
+        query.where(cb.equal(cb.lower(joinedEmailAddresses), email.toLowerCase()));
+        query.orderBy(cb.asc(root.get(User_.username)));
+        final List<User> resultList = entityManager.createQuery(query).getResultList();
         if (resultList.isEmpty()) {
             return null;
         }
         if (resultList.size() > 1) {
-            Log.error(Constants.DOMAIN_LOG_MODULE, "The database is inconsistent.  There are multiple users with the email address: " +
-                email);
+            Log.error(Constants.DOMAIN_LOG_MODULE, String.format("The database is inconsistent.  There are multiple users with the email address: %s",
+                email));
         }
         return resultList.get(0);
     }
 
     @Override
-    public User findOneByEmailAndSecurityAuthTypeIsNullOrEmpty(final String email) {
-        CriteriaBuilder cb = _entityManager.getCriteriaBuilder();
+    public User findOneByEmailAndSecurityAuthTypeIsNullOrEmpty(@Nonnull final String email) {
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
         CriteriaQuery<User> query = cb.createQuery(User.class);
         Root<User> root = query.from(User.class);
         Join<User, String> joinedEmailAddresses = root.join(User_.emailAddresses);
@@ -85,33 +86,44 @@ public User findOneByEmailAndSecurityAuthTypeIsNullOrEmpty(final String email) {
         query.where(cb.and(
             // Case in-sensitive email search
             cb.equal(cb.lower(joinedEmailAddresses), email.toLowerCase()),
-            cb.or(cb.isNull(authTypePath), cb.equal(cb.trim(authTypePath), ""))));
-        List<User> results = _entityManager.createQuery(query).getResultList();
+            cb.or(cb.isNull(authTypePath), cb.equal(cb.trim(authTypePath), "")))
+        ).orderBy(cb.asc(root.get(User_.username)));
+        List<User> results = entityManager.createQuery(query).getResultList();
 
 
         if (results.isEmpty()) {
             return null;
         } else {
+            if (results.size() > 1) {
+                Log.error(Constants.DOMAIN_LOG_MODULE, String.format("The database is inconsistent.  There are multiple users with the email address: %s",
+                    email));
+            }
             return results.get(0);
         }
     }
 
     @Override
-    public User findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(final String username) {
-        CriteriaBuilder cb = _entityManager.getCriteriaBuilder();
+    public User findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(@Nonnull final String username) {
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
         CriteriaQuery<User> query = cb.createQuery(User.class);
         Root<User> root = query.from(User.class);
 
         final Path<String> authTypePath = root.get(User_.security).get(UserSecurity_.authType);
         final Path<String> usernamePath = root.get(User_.username);
         // Case in-sensitive username search
-        query.where(cb.and(cb.equal(cb.lower(usernamePath), username.toLowerCase()), cb.or(cb.isNull(authTypePath), cb.equal(cb.trim(authTypePath), ""))));
-        List<User> results = _entityManager.createQuery(query).getResultList();
-
+        query.where(cb.and(
+            cb.equal(cb.lower(usernamePath), username.toLowerCase()),
+            cb.or(cb.isNull(authTypePath), cb.equal(cb.trim(authTypePath), "")))
+        ).orderBy(cb.asc(root.get(User_.username)));
+        List<User> results = entityManager.createQuery(query).getResultList();
 
         if (results.isEmpty()) {
             return null;
         } else {
+            if (results.size() > 1) {
+                Log.error(Constants.DOMAIN_LOG_MODULE, String.format("The database is inconsistent.  There are multiple users with username: %s",
+                    username));
+            }
             return results.get(0);
         }
     }
@@ -119,7 +131,7 @@ public User findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(final String usern
     @Nonnull
     @Override
     public List<String> findDuplicatedUsernamesCaseInsensitive() {
-        CriteriaBuilder cb = _entityManager.getCriteriaBuilder();
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
         CriteriaQuery<String> query = cb.createQuery(String.class);
 
         Root<User> userRoot = query.from(User.class);
@@ -127,7 +139,7 @@ public List<String> findDuplicatedUsernamesCaseInsensitive() {
         query.groupBy(cb.lower(userRoot.get(User_.username)));
         query.having(cb.gt(cb.count(userRoot), 1));
 
-        return _entityManager.createQuery(query).getResultList();
+        return entityManager.createQuery(query).getResultList();
     }
 
     @Override
@@ -143,8 +155,8 @@ public List<Pair<Integer, User>> findAllByGroupOwnerNameAndProfile(@Nonnull fina
     }
 
     private List<Pair<Integer, User>> findAllByGroupOwnerNameAndProfileInternal(@Nonnull final Collection<Integer> metadataIds,
-                                                                       @Nullable final Profile profile, boolean draft) {
-        CriteriaBuilder cb = _entityManager.getCriteriaBuilder();
+                                                                                @Nullable final Profile profile, boolean draft) {
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
         CriteriaQuery<Tuple> query = cb.createQuery(Tuple.class);
 
         Root<User> userRoot = query.from(User.class);
@@ -152,22 +164,20 @@ private List<Pair<Integer, User>> findAllByGroupOwnerNameAndProfileInternal(@Non
 
         Predicate metadataPredicate;
         Predicate ownerPredicate;
-        Root<Metadata> metadataRoot = null;
-        Root<MetadataDraft> metadataDraftRoot = null;
 
         if (!draft) {
-            metadataRoot = query.from(Metadata.class);
+            Root<Metadata> metadataRoot = query.from(Metadata.class);
             query.multiselect(metadataRoot.get(Metadata_.id), userRoot);
             metadataPredicate = metadataRoot.get(Metadata_.id).in(metadataIds);
 
             ownerPredicate = cb.equal(metadataRoot.get(Metadata_.sourceInfo).get(MetadataSourceInfo_.groupOwner),
                 userGroupRoot.get(UserGroup_.id).get(UserGroupId_.groupId));
         } else {
-            metadataDraftRoot = query.from(MetadataDraft.class);
-            query.multiselect(metadataDraftRoot.get(MetadataDraft_.id), userRoot);
-            metadataPredicate = metadataDraftRoot.get(Metadata_.id).in(metadataIds);
+            Root<MetadataDraft> metadataRoot = query.from(MetadataDraft.class);
+            query.multiselect(metadataRoot.get(MetadataDraft_.id), userRoot);
+            metadataPredicate = metadataRoot.get(MetadataDraft_.id).in(metadataIds);
 
-            ownerPredicate = cb.equal(metadataDraftRoot.get(Metadata_.sourceInfo).get(MetadataSourceInfo_.groupOwner),
+            ownerPredicate = cb.equal(metadataRoot.get(MetadataDraft_.sourceInfo).get(MetadataSourceInfo_.groupOwner),
                 userGroupRoot.get(UserGroup_.id).get(UserGroupId_.groupId));
         }
 
@@ -186,7 +196,7 @@ private List<Pair<Integer, User>> findAllByGroupOwnerNameAndProfileInternal(@Non
 
         List<Pair<Integer, User>> results = new ArrayList<>();
 
-        for (Tuple result : _entityManager.createQuery(query).getResultList()) {
+        for (Tuple result : entityManager.createQuery(query).getResultList()) {
             Integer mdId = (Integer) result.get(0);
             User user = (User) result.get(1);
             results.add(Pair.read(mdId, user));
@@ -197,7 +207,7 @@ private List<Pair<Integer, User>> findAllByGroupOwnerNameAndProfileInternal(@Non
     @Nonnull
     @Override
     public List<User> findAllUsersThatOwnMetadata() {
-        final CriteriaBuilder cb = _entityManager.getCriteriaBuilder();
+        final CriteriaBuilder cb = entityManager.getCriteriaBuilder();
         final CriteriaQuery<User> query = cb.createQuery(User.class);
 
         final Root<Metadata> metadataRoot = query.from(Metadata.class);
@@ -210,13 +220,13 @@ public List<User> findAllUsersThatOwnMetadata() {
         query.where(ownerExpression);
         query.distinct(true);
 
-        return _entityManager.createQuery(query).getResultList();
+        return entityManager.createQuery(query).getResultList();
     }
 
     @Nonnull
     @Override
     public List<User> findAllUsersInUserGroups(@Nonnull final Specification<UserGroup> userGroupSpec) {
-        final CriteriaBuilder cb = _entityManager.getCriteriaBuilder();
+        final CriteriaBuilder cb = entityManager.getCriteriaBuilder();
         final CriteriaQuery<User> query = cb.createQuery(User.class);
 
         final Root<UserGroup> userGroupRoot = query.from(UserGroup.class);
@@ -229,7 +239,7 @@ public List<User> findAllUsersInUserGroups(@Nonnull final Specification<UserGrou
         query.where(cb.and(ownerExpression, userGroupSpec.toPredicate(userGroupRoot, query, cb)));
         query.distinct(true);
 
-        return _entityManager.createQuery(query).getResultList();
+        return entityManager.createQuery(query).getResultList();
     }
 
 }
diff --git a/domain/src/test/java/org/fao/geonet/repository/UserRepositoryTest.java b/domain/src/test/java/org/fao/geonet/repository/UserRepositoryTest.java
index cc020a7d568..66528b2e4ca 100644
--- a/domain/src/test/java/org/fao/geonet/repository/UserRepositoryTest.java
+++ b/domain/src/test/java/org/fao/geonet/repository/UserRepositoryTest.java
@@ -29,34 +29,34 @@
 import org.fao.geonet.domain.*;
 import org.fao.geonet.repository.specification.UserGroupSpecs;
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 
+
 import javax.annotation.Nullable;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static junit.framework.Assert.assertNull;
 import static org.junit.Assert.*;
 
 public class UserRepositoryTest extends AbstractSpringDataTest {
     @Autowired
-    UserGroupRepository _userGroupRepository;
+    UserGroupRepository userGroupRepository;
     @Autowired
-    MetadataRepository _metadataRepo;
+    MetadataRepository metadataRepo;
     @Autowired
-    GroupRepository _groupRepo;
+    GroupRepository groupRepo;
     @Autowired
-    UserRepository _userRepo;
+    UserRepository userRepo;
     @PersistenceContext
-    private EntityManager _entityManager;
+    private EntityManager entityManager;
 
     public static User newUser(AtomicInteger inc) {
         String val = String.format("%04d", inc.incrementAndGet());
@@ -72,15 +72,15 @@ public void testNodeIdIsSetOnLoad() {
 
         assertNull(user.getSecurity().getNodeId());
 
-        _userRepo.save(user);
+        userRepo.save(user);
         // save sets the nodeId
         assertNodeId(user);
         // loading should also set nodeid
-        assertNodeId(_userRepo.findAll().get(0));
-        assertNodeId(_userRepo.findById(user.getId()).get());
-        assertNodeId(_userRepo.findOneByUsername(user.getUsername()));
-        assertNodeId(_userRepo.findOneByEmail(user.getEmail()));
-        assertNodeId(_userRepo.findAllByProfile(user.getProfile()).get(0));
+        assertNodeId(userRepo.findAll().get(0));
+        assertNodeId(userRepo.findById(user.getId()).get());
+        assertNodeId(userRepo.findOneByUsername(user.getUsername()));
+        assertNodeId(userRepo.findOneByEmail(user.getEmail()));
+        assertNodeId(userRepo.findAllByProfile(user.getProfile()).get(0));
 
     }
 
@@ -88,8 +88,8 @@ private void assertNodeId(User loaded4) {
         String testNodeId = "testNodeId";
         assertEquals(testNodeId, loaded4.getSecurity().getNodeId());
         loaded4.getSecurity().setNodeId(null);
-        _entityManager.flush();
-        _entityManager.clear();
+        entityManager.flush();
+        entityManager.clear();
     }
 
     @Test
@@ -99,33 +99,33 @@ public void testFindByEmailAddress() {
         String add1b = "add1b";
         user1.getEmailAddresses().add(add1);
         user1.getEmailAddresses().add(add1b);
-        user1 = _userRepo.save(user1);
+        user1 = userRepo.save(user1);
 
         User user2 = newUser();
         String add2 = "add2";
         String add2b = "add2b";
         user2.getEmailAddresses().add(add2);
         user2.getEmailAddresses().add(add2b);
-        user2 = _userRepo.save(user2);
+        user2 = userRepo.save(user2);
 
-        User foundUser = _userRepo.findOneByEmail(add1);
+        User foundUser = userRepo.findOneByEmail(add1);
         assertNotNull(foundUser);
         assertEquals(user1.getId(), foundUser.getId());
 
-        foundUser = _userRepo.findOneByEmail(add1b);
+        foundUser = userRepo.findOneByEmail(add1b);
         assertNotNull(foundUser);
         assertEquals(user1.getId(), foundUser.getId());
 
-        foundUser = _userRepo.findOneByEmail(add2b);
+        foundUser = userRepo.findOneByEmail(add2b);
         assertNotNull(foundUser);
         assertEquals(user2.getId(), foundUser.getId());
 
         // Test case-insensitive
-        foundUser = _userRepo.findOneByEmail(add2b.toUpperCase());
+        foundUser = userRepo.findOneByEmail(add2b.toUpperCase());
         assertNotNull(foundUser);
         assertEquals(user2.getId(), foundUser.getId());
 
-        foundUser = _userRepo.findOneByEmail("xjkjk");
+        foundUser = userRepo.findOneByEmail("xjkjk");
         assertNull(foundUser);
     }
 
@@ -133,32 +133,32 @@ public void testFindByEmailAddress() {
     public void testFindByUsernameAndAuthTypeIsNullOrEmpty() {
         User user1 = newUser();
         user1.getSecurity().setAuthType("");
-        user1 = _userRepo.save(user1);
+        user1 = userRepo.save(user1);
 
         User user2 = newUser();
         user2.getSecurity().setAuthType(null);
-        user2 = _userRepo.save(user2);
+        user2 = userRepo.save(user2);
 
         User user3 = newUser();
         user3.getSecurity().setAuthType("nonull");
-        _userRepo.save(user3);
+        userRepo.save(user3);
 
-        User foundUser = _userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(user1.getUsername());
+        User foundUser = userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(user1.getUsername());
         assertNotNull(foundUser);
         assertEquals(user1.getId(), foundUser.getId());
 
-        foundUser = _userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(user2.getUsername());
+        foundUser = userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(user2.getUsername());
         assertNotNull(foundUser);
         assertEquals(user2.getId(), foundUser.getId());
 
-        foundUser = _userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(user3.getUsername());
+        foundUser = userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(user3.getUsername());
         assertNull(foundUser);
 
         // Test case-insensitive
-        foundUser = _userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(user3.getUsername().toUpperCase());
+        foundUser = userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(user3.getUsername().toUpperCase());
         assertNull(foundUser);
 
-        foundUser = _userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty("blarg");
+        foundUser = userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty("blarg");
         assertNull(foundUser);
     }
 
@@ -168,79 +168,79 @@ public void testFindOneByEmailAndSecurityAuthTypeIsNullOrEmpty() {
         User user1 = newUser();
         user1.getSecurity().setAuthType("");
         user1.getEmailAddresses().add("user1@geonetwork.com");
-        user1 = _userRepo.save(user1);
+        user1 = userRepo.save(user1);
 
         User user2 = newUser();
         user2.getSecurity().setAuthType(null);
         user2.getEmailAddresses().add("user2@geonetwork.com");
-        user2 = _userRepo.save(user2);
+        user2 = userRepo.save(user2);
 
         User user3 = newUser();
         user3.getSecurity().setAuthType("nonull");
         user3.getEmailAddresses().add("user3@geonetwork.com");
-        _userRepo.save(user3);
+        userRepo.save(user3);
 
-        User foundUser = _userRepo.findOneByEmailAndSecurityAuthTypeIsNullOrEmpty(user1.getEmail());
+        User foundUser = userRepo.findOneByEmailAndSecurityAuthTypeIsNullOrEmpty(user1.getEmail());
         assertNotNull(foundUser);
         assertEquals(user1.getId(), foundUser.getId());
 
-        foundUser = _userRepo.findOneByEmailAndSecurityAuthTypeIsNullOrEmpty(user2.getEmail());
+        foundUser = userRepo.findOneByEmailAndSecurityAuthTypeIsNullOrEmpty(user2.getEmail());
         assertNotNull(foundUser);
         assertEquals(user2.getId(), foundUser.getId());
 
-        foundUser = _userRepo.findOneByEmailAndSecurityAuthTypeIsNullOrEmpty(user3.getEmail());
+        foundUser = userRepo.findOneByEmailAndSecurityAuthTypeIsNullOrEmpty(user3.getEmail());
         assertNull(foundUser);
 
         // Test case-insensitive
-        foundUser = _userRepo.findOneByEmailAndSecurityAuthTypeIsNullOrEmpty(user3.getEmail().toUpperCase());
+        foundUser = userRepo.findOneByEmailAndSecurityAuthTypeIsNullOrEmpty(user3.getEmail().toUpperCase());
         assertNull(foundUser);
 
-        foundUser = _userRepo.findOneByEmailAndSecurityAuthTypeIsNullOrEmpty("blarg");
+        foundUser = userRepo.findOneByEmailAndSecurityAuthTypeIsNullOrEmpty("blarg");
         assertNull(foundUser);
     }
 
     @Test
     public void testFindByUsername() {
         User user1 = newUser();
-        user1 = _userRepo.save(user1);
+        user1 = userRepo.save(user1);
 
-        User foundUser = _userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(user1.getUsername());
+        User foundUser = userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty(user1.getUsername());
         assertNotNull(foundUser);
         assertEquals(user1.getId(), foundUser.getId());
 
-        foundUser = _userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty("blarg");
+        foundUser = userRepo.findOneByUsernameAndSecurityAuthTypeIsNullOrEmpty("blarg");
         assertNull(foundUser);
     }
 
     @Test
     public void testFindAllByGroupOwnerNameAndProfile() {
-        Group group1 = _groupRepo.save(GroupRepositoryTest.newGroup(_inc));
-        Group group2 = _groupRepo.save(GroupRepositoryTest.newGroup(_inc));
+        Group group1 = groupRepo.save(GroupRepositoryTest.newGroup(_inc));
+        Group group2 = groupRepo.save(GroupRepositoryTest.newGroup(_inc));
 
-        User editUser = _userRepo.save(newUser().setProfile(Profile.Editor));
-        User reviewerUser = _userRepo.save(newUser().setProfile(Profile.Reviewer));
-        User registeredUser = _userRepo.save(newUser().setProfile(Profile.RegisteredUser));
-        _userRepo.save(newUser().setProfile(Profile.Administrator));
+        User editUser = userRepo.save(newUser().setProfile(Profile.Editor));
+        User reviewerUser = userRepo.save(newUser().setProfile(Profile.Reviewer));
+        User registeredUser = userRepo.save(newUser().setProfile(Profile.RegisteredUser));
+        userRepo.save(newUser().setProfile(Profile.Administrator));
 
         Metadata md1 = MetadataRepositoryTest.newMetadata(_inc);
         md1.getSourceInfo().setGroupOwner(group1.getId());
-        md1 = _metadataRepo.save(md1);
+        md1 = metadataRepo.save(md1);
 
         Metadata md2 = MetadataRepositoryTest.newMetadata(_inc);
         md2.getSourceInfo().setGroupOwner(group1.getId());
-        md2 = _metadataRepo.save(md2);
+        md2 = metadataRepo.save(md2);
 
         Metadata md3 = MetadataRepositoryTest.newMetadata(_inc);
         md3.getSourceInfo().setGroupOwner(group2.getId());
-        _metadataRepo.save(md3);
+        metadataRepo.save(md3);
 
-        _userGroupRepository.save(new UserGroup().setGroup(group1).setUser(editUser).setProfile(Profile.Editor));
-        _userGroupRepository.save(new UserGroup().setGroup(group2).setUser(registeredUser).setProfile(Profile.RegisteredUser));
-        _userGroupRepository.save(new UserGroup().setGroup(group2).setUser(reviewerUser).setProfile(Profile.Editor));
-        _userGroupRepository.save(new UserGroup().setGroup(group1).setUser(reviewerUser).setProfile(Profile.Reviewer));
+        userGroupRepository.save(new UserGroup().setGroup(group1).setUser(editUser).setProfile(Profile.Editor));
+        userGroupRepository.save(new UserGroup().setGroup(group2).setUser(registeredUser).setProfile(Profile.RegisteredUser));
+        userGroupRepository.save(new UserGroup().setGroup(group2).setUser(reviewerUser).setProfile(Profile.Editor));
+        userGroupRepository.save(new UserGroup().setGroup(group1).setUser(reviewerUser).setProfile(Profile.Reviewer));
 
-        List<Pair<Integer, User>> found = _userRepo.findAllByGroupOwnerNameAndProfile(Arrays.asList(md1.getId()), null);
-        Collections.sort(found, Comparator.comparing(s -> s.two().getName()));
+        List<Pair<Integer, User>> found = userRepo.findAllByGroupOwnerNameAndProfile(List.of(md1.getId()), null);
+        found.sort(Comparator.comparing(s -> s.two().getName()));
 
         assertEquals(2, found.size());
         assertEquals(md1.getId(), found.get(0).one().intValue());
@@ -248,9 +248,9 @@ public void testFindAllByGroupOwnerNameAndProfile() {
         assertEquals(editUser, found.get(0).two());
         assertEquals(reviewerUser, found.get(1).two());
 
-        found = _userRepo.findAllByGroupOwnerNameAndProfile(Arrays.asList(md1.getId()), null);
+        found = userRepo.findAllByGroupOwnerNameAndProfile(List.of(md1.getId()), null);
         // Sort by user name descending
-        Collections.sort(found, Comparator.comparing(s -> s.two().getName(), Comparator.reverseOrder()));
+        found.sort(Comparator.comparing(s -> s.two().getName(), Comparator.reverseOrder()));
 
         assertEquals(2, found.size());
         assertEquals(md1.getId(), found.get(0).one().intValue());
@@ -259,7 +259,7 @@ public void testFindAllByGroupOwnerNameAndProfile() {
         assertEquals(reviewerUser, found.get(0).two());
 
 
-        found = _userRepo.findAllByGroupOwnerNameAndProfile(Arrays.asList(md1.getId(), md2.getId()), null);
+        found = userRepo.findAllByGroupOwnerNameAndProfile(Arrays.asList(md1.getId(), md2.getId()), null);
 
         assertEquals(4, found.size());
         int md1Found = 0;
@@ -277,21 +277,21 @@ public void testFindAllByGroupOwnerNameAndProfile() {
 
     @Test
     public void testFindAllUsersInUserGroups() {
-        Group group1 = _groupRepo.save(GroupRepositoryTest.newGroup(_inc));
-        Group group2 = _groupRepo.save(GroupRepositoryTest.newGroup(_inc));
+        Group group1 = groupRepo.save(GroupRepositoryTest.newGroup(_inc));
+        Group group2 = groupRepo.save(GroupRepositoryTest.newGroup(_inc));
 
-        User editUser = _userRepo.save(newUser().setProfile(Profile.Editor));
-        User reviewerUser = _userRepo.save(newUser().setProfile(Profile.Reviewer));
-        User registeredUser = _userRepo.save(newUser().setProfile(Profile.RegisteredUser));
-        _userRepo.save(newUser().setProfile(Profile.Administrator));
+        User editUser = userRepo.save(newUser().setProfile(Profile.Editor));
+        User reviewerUser = userRepo.save(newUser().setProfile(Profile.Reviewer));
+        User registeredUser = userRepo.save(newUser().setProfile(Profile.RegisteredUser));
+        userRepo.save(newUser().setProfile(Profile.Administrator));
 
-        _userGroupRepository.save(new UserGroup().setGroup(group1).setUser(editUser).setProfile(Profile.Editor));
-        _userGroupRepository.save(new UserGroup().setGroup(group2).setUser(registeredUser).setProfile(Profile.RegisteredUser));
-        _userGroupRepository.save(new UserGroup().setGroup(group2).setUser(reviewerUser).setProfile(Profile.Editor));
-        _userGroupRepository.save(new UserGroup().setGroup(group1).setUser(reviewerUser).setProfile(Profile.Reviewer));
+        userGroupRepository.save(new UserGroup().setGroup(group1).setUser(editUser).setProfile(Profile.Editor));
+        userGroupRepository.save(new UserGroup().setGroup(group2).setUser(registeredUser).setProfile(Profile.RegisteredUser));
+        userGroupRepository.save(new UserGroup().setGroup(group2).setUser(reviewerUser).setProfile(Profile.Editor));
+        userGroupRepository.save(new UserGroup().setGroup(group1).setUser(reviewerUser).setProfile(Profile.Reviewer));
 
-        List<Integer> found = Lists.transform(_userRepo.findAllUsersInUserGroups(UserGroupSpecs.hasGroupId(group1.getId())),
-            new Function<User, Integer>() {
+        List<Integer> found = Lists.transform(userRepo.findAllUsersInUserGroups(UserGroupSpecs.hasGroupId(group1.getId())),
+            new Function<>() {
 
                 @Nullable
                 @Override
@@ -304,7 +304,7 @@ public Integer apply(@Nullable User input) {
         assertTrue(found.contains(editUser.getId()));
         assertTrue(found.contains(reviewerUser.getId()));
 
-        found = Lists.transform(_userRepo.findAllUsersInUserGroups(Specification.not(UserGroupSpecs.hasProfile(Profile.RegisteredUser)
+        found = Lists.transform(userRepo.findAllUsersInUserGroups(Specification.not(UserGroupSpecs.hasProfile(Profile.RegisteredUser)
         )), new Function<User, Integer>() {
 
             @Nullable
@@ -323,21 +323,20 @@ public Integer apply(@Nullable User input) {
 
     @Test
     public void testFindAllUsersThatOwnMetadata() {
-
-        User editUser = _userRepo.save(newUser().setProfile(Profile.Editor));
-        User reviewerUser = _userRepo.save(newUser().setProfile(Profile.Reviewer));
-        _userRepo.save(newUser().setProfile(Profile.RegisteredUser));
-        _userRepo.save(newUser().setProfile(Profile.Administrator));
+        User editUser = userRepo.save(newUser().setProfile(Profile.Editor));
+        User reviewerUser = userRepo.save(newUser().setProfile(Profile.Reviewer));
+        userRepo.save(newUser().setProfile(Profile.RegisteredUser));
+        userRepo.save(newUser().setProfile(Profile.Administrator));
 
         Metadata md1 = MetadataRepositoryTest.newMetadata(_inc);
         md1.getSourceInfo().setOwner(editUser.getId());
-        _metadataRepo.save(md1);
+        metadataRepo.save(md1);
 
         Metadata md2 = MetadataRepositoryTest.newMetadata(_inc);
         md2.getSourceInfo().setOwner(reviewerUser.getId());
-        _metadataRepo.save(md2);
+        metadataRepo.save(md2);
 
-        List<User> found = _userRepo.findAllUsersThatOwnMetadata();
+        List<User> found = userRepo.findAllUsersThatOwnMetadata();
 
         assertEquals(2, found.size());
         boolean editUserFound = false;
@@ -363,12 +362,12 @@ public void testFindDuplicatedUsernamesCaseInsensitive() {
         User userNonDuplicated1 = newUser();
         usernameDuplicated1.setUsername("userNamE1");
         usernameDuplicated2.setUsername("usERNAME1");
-        _userRepo.save(usernameDuplicated1);
-        _userRepo.save(usernameDuplicated2);
-        _userRepo.save(userNonDuplicated1);
+        userRepo.save(usernameDuplicated1);
+        userRepo.save(usernameDuplicated2);
+        userRepo.save(userNonDuplicated1);
 
-        List<String> duplicatedUsernames = _userRepo.findDuplicatedUsernamesCaseInsensitive();
-        assertThat("Duplicated usernames don't match the expected ones",
+        List<String> duplicatedUsernames = userRepo.findDuplicatedUsernamesCaseInsensitive();
+        MatcherAssert.assertThat("Duplicated usernames don't match the expected ones",
             duplicatedUsernames, CoreMatchers.is(Lists.newArrayList("username1")));
         assertEquals(1, duplicatedUsernames.size());
 
diff --git a/services/src/main/java/org/fao/geonet/api/users/PasswordApi.java b/services/src/main/java/org/fao/geonet/api/users/PasswordApi.java
index 4360fd7875a..00e4010dad8 100644
--- a/services/src/main/java/org/fao/geonet/api/users/PasswordApi.java
+++ b/services/src/main/java/org/fao/geonet/api/users/PasswordApi.java
@@ -76,6 +76,7 @@ public class PasswordApi {
     public static final String LOGGER = Geonet.GEONETWORK + ".api.user";
 
     public static final String DATE_FORMAT = "yyyy-MM-dd";
+    public static final String USER_PASSWORD_SENT = "user_password_sent";
     @Autowired
     LanguageUtils languageUtils;
     @Autowired
@@ -85,14 +86,13 @@ public class PasswordApi {
     @Autowired
     FeedbackLanguages feedbackLanguages;
 
-    @Autowired(required=false)
+    @Autowired(required = false)
     SecurityProviderConfiguration securityProviderConfiguration;
 
     @io.swagger.v3.oas.annotations.Operation(summary = "Update user password",
         description = "Get a valid changekey by email first and then update your password.")
-    @RequestMapping(
+    @PatchMapping(
         value = "/{username}",
-        method = RequestMethod.PATCH,
         produces = MediaType.TEXT_PLAIN_VALUE)
     @ResponseStatus(value = HttpStatus.CREATED)
     @ResponseBody
@@ -100,13 +100,12 @@ public ResponseEntity<String> updatePassword(
         @Parameter(description = "The user name",
             required = true)
         @PathVariable
-            String username,
+        String username,
         @Parameter(description = "The new password and a valid change key",
             required = true)
         @RequestBody
-            PasswordUpdateParameter passwordAndChangeKey,
-        HttpServletRequest request)
-        throws Exception {
+        PasswordUpdateParameter passwordAndChangeKey,
+        HttpServletRequest request) {
         Locale locale = languageUtils.parseAcceptLanguage(request.getLocales());
         ResourceBundle messages = ResourceBundle.getBundle("org.fao.geonet.api.Messages", locale);
         Locale[] feedbackLocales = feedbackLanguages.getLocales(locale);
@@ -208,9 +207,8 @@ public ResponseEntity<String> updatePassword(
             "reset his password. User MUST have an email to get the link. " +
             "LDAP users will not be able to retrieve their password " +
             "using this service.")
-    @RequestMapping(
+    @PutMapping(
         value = "/actions/forgot-password",
-        method = RequestMethod.PUT,
         produces = MediaType.TEXT_PLAIN_VALUE)
     @ResponseStatus(value = HttpStatus.CREATED)
     @ResponseBody
@@ -218,9 +216,8 @@ public ResponseEntity<String> sendPasswordByEmail(
         @Parameter(description = "The user name",
             required = true)
         @RequestParam
-            String username,
-        HttpServletRequest request)
-        throws Exception {
+        String username,
+        HttpServletRequest request) {
         Locale locale = languageUtils.parseAcceptLanguage(request.getLocales());
         ResourceBundle messages = ResourceBundle.getBundle("org.fao.geonet.api.Messages", locale);
         Locale[] feedbackLocales = feedbackLanguages.getLocales(locale);
@@ -239,7 +236,7 @@ public ResponseEntity<String> sendPasswordByEmail(
 
             // Return response not providing details about the issue, that should be logged.
             return new ResponseEntity<>(String.format(
-                messages.getString("user_password_sent"),
+                messages.getString(USER_PASSWORD_SENT),
                 XslUtil.encodeForJavaScript(username)
             ), HttpStatus.CREATED);
         }
@@ -251,7 +248,7 @@ public ResponseEntity<String> sendPasswordByEmail(
 
             // Return response not providing details about the issue, that should be logged.
             return new ResponseEntity<>(String.format(
-                messages.getString("user_password_sent"),
+                messages.getString(USER_PASSWORD_SENT),
                 XslUtil.encodeForJavaScript(username)
             ), HttpStatus.CREATED);
         }
@@ -263,7 +260,7 @@ public ResponseEntity<String> sendPasswordByEmail(
 
             // Return response not providing details about the issue, that should be logged.
             return new ResponseEntity<>(String.format(
-                messages.getString("user_password_sent"),
+                messages.getString(USER_PASSWORD_SENT),
                 XslUtil.encodeForJavaScript(username)
             ), HttpStatus.CREATED);
         }
@@ -317,7 +314,7 @@ public ResponseEntity<String> sendPasswordByEmail(
         }
 
         return new ResponseEntity<>(String.format(
-            messages.getString("user_password_sent"),
+            messages.getString(USER_PASSWORD_SENT),
             XslUtil.encodeForJavaScript(username)
         ), HttpStatus.CREATED);
     }