diff --git a/src/main/java/eu/mulk/mulkcms2/entity/User.java b/src/main/java/eu/mulk/mulkcms2/entity/User.java
index 1c9e425..ebe5048 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/User.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/User.java
@@ -6,6 +6,7 @@
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
@@ -98,7 +99,7 @@
     return Objects.hash(id, name, status, email, website);
   }
 
-  @OneToMany(mappedBy = "authors")
+  @OneToMany(mappedBy = "authors", fetch = FetchType.LAZY)
   public Collection<ArticleRevision> getArticleRevisions() {
     return articleRevisions;
   }
@@ -107,7 +108,7 @@
     this.articleRevisions = articleRevisions;
   }
 
-  @OneToMany(mappedBy = "user")
+  @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
   public Collection<CommentRevision> getCommentRevisions() {
     return commentRevisions;
   }
@@ -116,7 +117,7 @@
     this.commentRevisions = commentRevisions;
   }
 
-  @OneToMany(mappedBy = "user")
+  @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
   public Collection<LoginCertificate> getLoginCertificates() {
     return loginCertificates;
   }
@@ -125,7 +126,7 @@
     this.loginCertificates = loginCertificates;
   }
 
-  @OneToMany(mappedBy = "user")
+  @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
   public Collection<OpenId> getOpenids() {
     return openids;
   }
@@ -134,7 +135,7 @@
     this.openids = openids;
   }
 
-  @OneToMany(mappedBy = "user")
+  @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
   public Collection<Password> getPasswords() {
     return passwords;
   }
@@ -143,7 +144,7 @@
     this.passwords = passwords;
   }
 
-  @OneToMany(mappedBy = "user")
+  @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
   public Collection<UserPermission> getUserPermissions() {
     return userPermissions;
   }
@@ -152,7 +153,7 @@
     this.userPermissions = userPermissions;
   }
 
-  @OneToMany(mappedBy = "user")
+  @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
   public Collection<UserSetting> getUserSettings() {
     return userSettings;
   }
