diff --git a/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java b/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java
index e057c357009e475561f34fe710d3490d6ffeb790..79b437fed3218f9337b3b0486357244c8c5a861f 100644
--- a/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java
+++ b/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java
@@ -174,7 +174,11 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
      */
     public synchronized User getUser() {
         User user = new User(getUserInfos());
-        user.setAgreeNDA(user.getAgreeNDA());
+        User foundUser = userRepository.findOne(user.getUsername());
+        if(foundUser != null)
+        {
+            user.setAgreeNDA(foundUser.getAgreeNDA());
+        }
         userRepository.save(user);
         return user;
     }
@@ -197,8 +201,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 
     @RequestMapping(path = "/user", method = RequestMethod.POST)
     public ResponseEntity<Void> postUser(@ApiParam(value = "Has the user agreed on the NDA") @RequestParam(value = "agreeNDA", required = true) Boolean agreeNDA) {
-        String username = getUser().getUsername();
-        User user = userRepository.findOne(username);
+        User user = getUser();
         if (user != null) {
             user.setAgreeNDA(agreeNDA);
             userRepository.save(user);