diff -r 63a31871189e -r fd8c40ff78c3 src/main/java/de/uapcore/lightpit/entities/User.java
--- a/src/main/java/de/uapcore/lightpit/entities/User.java	Sat May 09 14:58:41 2020 +0200
+++ b/src/main/java/de/uapcore/lightpit/entities/User.java	Sat May 09 15:19:21 2020 +0200
@@ -1,8 +1,8 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
+ *
  * Copyright 2018 Mike Becker. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
@@ -24,20 +24,18 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 package de.uapcore.lightpit.entities;
 
-import java.util.Optional;
+public final class User {
 
-public final class User {
-    
     public static final int ANONYMOUS_USERID = -1;
-    
+
     private int userID;
     private String username;
-    private Optional<String> givenname;
-    private Optional<String> lastname;
+    private String givenname;
+    private String lastname;
 
     public int getUserID() {
         return userID;
@@ -55,19 +53,19 @@
         this.username = username;
     }
 
-    public Optional<String> getGivenname() {
+    public String getGivenname() {
         return givenname;
     }
 
-    public void setGivenname(Optional<String> givenname) {
+    public void setGivenname(String givenname) {
         this.givenname = givenname;
     }
 
-    public Optional<String> getLastname() {
+    public String getLastname() {
         return lastname;
     }
 
-    public void setLastname(Optional<String> lastname) {
+    public void setLastname(String lastname) {
         this.lastname = lastname;
     }
 
@@ -88,5 +86,5 @@
         } else {
             return this.userID == ((User) obj).userID;
         }
-    }    
+    }
 }