diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/RegisterController.java b/prototype/src/main/java/org/hso/ecommerce/controller/RegisterController.java
index 4ca8ac8..128ca3a 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/RegisterController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/RegisterController.java
@@ -1,5 +1,6 @@
 package org.hso.ecommerce.controller;
 
+import org.hso.ecommerce.entities.booking.PaymentMethod;
 import org.hso.ecommerce.entities.shop.Address;
 import org.hso.ecommerce.entities.user.User;
 import org.hso.ecommerce.repos.user.UserRepository;
@@ -51,6 +52,7 @@ public class RegisterController  {
         newUser.email = username;
         newUser.isEmployee = false;
         newUser.salutation = salutation;
+        newUser.defaultPayment = PaymentMethod.fromCreditCardNumber("");
 
         newUser.isActive = true;
         newUser.created = new java.sql.Timestamp(System.currentTimeMillis());
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java b/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
index ff901ba..8a90d43 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
@@ -1,7 +1,6 @@
 package org.hso.ecommerce.controller;
 
 import org.hso.ecommerce.action.user.UpdateUserSettingsAction;
-import org.hso.ecommerce.entities.booking.PaymentMethod;
 import org.hso.ecommerce.entities.shop.CustomerOrder;
 import org.hso.ecommerce.entities.user.User;
 import org.hso.ecommerce.repos.shop.CustomerOrderRepository;
@@ -39,9 +38,6 @@ public class UserController {
     ) {
         long userId = (long) session.getAttribute("userId");
         User user = userRepository.findById(userId).get();
-        if(user.defaultPayment == null){
-            user.defaultPayment = PaymentMethod.fromCreditCardNumber("");
-        }
         model.addAttribute("user", user);
 
         return "user/settings";