diff --git a/pom.xml b/pom.xml
index 9bca4c26..b0cfd757 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,13 +15,39 @@
     <name>OFN Record Manager</name>
     <packaging>jar</packaging>
 
+    <!-- The snapshot repositories are necessary only for JOPA 2.0.0-SNAPSHOT -->
+    <repositories>
+        <repository>
+            <id>central-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>central-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jdk.version>17</jdk.version>
         <maven.compiler.source>${jdk.version}</maven.compiler.source>
         <maven.compiler.target>${jdk.version}</maven.compiler.target>
 
-        <cz.cvut.kbss.jopa.version>1.1.3</cz.cvut.kbss.jopa.version>
+        <cz.cvut.kbss.jopa.version>2.0.0-SNAPSHOT</cz.cvut.kbss.jopa.version>
         <org.aspectj.version>1.9.20</org.aspectj.version>
         <org.mockito.version>4.11.0</org.mockito.version>
         <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
@@ -153,47 +179,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>dev.aspectj</groupId>
-                <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.13.1</version>
-                <configuration>
-                    <complianceLevel>${jdk.version}</complianceLevel>
-                    <source>${jdk.version}</source>
-                    <target>${jdk.version}</target>
-                    <aspectLibraries>
-                        <aspectLibrary>
-                            <groupId>cz.cvut.kbss.jopa</groupId>
-                            <artifactId>jopa-impl</artifactId>
-                        </aspectLibrary>
-                    </aspectLibraries>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.aspectj</groupId>
-                        <artifactId>aspectjtools</artifactId>
-                        <version>${org.aspectj.version}</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>main</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>compile</goal>
-                            <!-- use this goal to weave all your main classes -->
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>test</id>
-                        <phase>process-test-classes</phase>
-                        <goals>
-                            <goal>test-compile</goal>
-                            <!-- use this goal to weave all your test classes -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/src/main/java/cz/cvut/kbss/study/config/AppConfig.java b/src/main/java/cz/cvut/kbss/study/config/AppConfig.java
index bb2a388c..8ae24aaf 100644
--- a/src/main/java/cz/cvut/kbss/study/config/AppConfig.java
+++ b/src/main/java/cz/cvut/kbss/study/config/AppConfig.java
@@ -1,9 +1,7 @@
 package cz.cvut.kbss.study.config;
 
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
 @Configuration
-@EnableAspectJAutoProxy(proxyTargetClass = true)
 public class AppConfig {
 }
diff --git a/src/main/java/cz/cvut/kbss/study/model/User.java b/src/main/java/cz/cvut/kbss/study/model/User.java
index 836d365a..cf3a5d6a 100644
--- a/src/main/java/cz/cvut/kbss/study/model/User.java
+++ b/src/main/java/cz/cvut/kbss/study/model/User.java
@@ -11,8 +11,6 @@
 import cz.cvut.kbss.study.model.util.HasDerivableUri;
 import cz.cvut.kbss.study.util.Constants;
 import cz.cvut.kbss.study.util.IdentificationUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 import java.io.Serializable;
@@ -27,8 +25,6 @@
 @OWLClass(iri = Vocabulary.s_c_user)
 public class User implements HasDerivableUri, Serializable {
 
-    private static final Logger LOG = LoggerFactory.getLogger(User.class);
-
     @Id
     private URI uri;
 
@@ -191,7 +187,7 @@ public void encodePassword(PasswordEncoder encoder) {
         if (password == null || password.isEmpty()) {
             throw new IllegalStateException("Cannot encode an empty password.");
         }
-        this.password = encoder.encode(password);
+        setPassword(encoder.encode(password));
     }
 
     /**
diff --git a/src/test/java/cz/cvut/kbss/study/environment/config/TestPersistenceConfig.java b/src/test/java/cz/cvut/kbss/study/environment/config/TestPersistenceConfig.java
index e90c285a..9edc3713 100644
--- a/src/test/java/cz/cvut/kbss/study/environment/config/TestPersistenceConfig.java
+++ b/src/test/java/cz/cvut/kbss/study/environment/config/TestPersistenceConfig.java
@@ -7,7 +7,6 @@
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.annotation.Import;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.client.RestTemplate;
@@ -15,7 +14,6 @@
 import static org.mockito.Mockito.mock;
 
 @TestConfiguration
-@EnableAspectJAutoProxy(proxyTargetClass = true)
 @ComponentScan(basePackages = {"cz.cvut.kbss.study.persistence.dao"})
 @Import({PersistenceConfig.class, TestPersistenceFactory.class, TestFormGenPersistenceFactory.class})
 @EnableTransactionManagement
diff --git a/src/test/java/cz/cvut/kbss/study/service/BaseServiceTestRunner.java b/src/test/java/cz/cvut/kbss/study/service/BaseServiceTestRunner.java
index 9b2fc7f1..68a0777e 100644
--- a/src/test/java/cz/cvut/kbss/study/service/BaseServiceTestRunner.java
+++ b/src/test/java/cz/cvut/kbss/study/service/BaseServiceTestRunner.java
@@ -18,7 +18,6 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@EnableAspectJAutoProxy(proxyTargetClass = true)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {TestServiceConfig.class, TestPersistenceConfig.class})
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)