diff --git a/backend/src/main/java/com/nttdata/calender/presets/Presets.java b/backend/src/main/java/com/nttdata/calender/presets/Presets.java
index a0b6f96..1ddd425 100644
--- a/backend/src/main/java/com/nttdata/calender/presets/Presets.java
+++ b/backend/src/main/java/com/nttdata/calender/presets/Presets.java
@@ -64,24 +64,27 @@ public class Presets {
                 // SYSTEMDEFAULT
                 var sysdef = api.queryFieldsById("\'364000001\'==\"Systemdefault\"", defQuery.getFieldIds(), formDefault, null, 0, 0).get(0);
                 String sysdefGUID = sysdef.get(defQuery.getFieldId("InstanceId")).toString();
-                System.out.println(sysdefGUID);
 
                 // CHECK IF USER HAS PREFERENCES
                 var preference = api.queryFieldsById("\'2\'==\"ext_GedikSa\"", prefQuery.getFieldIds(), formUserPref, null, 0, 0);
-                if (preference != null) {
+
+                if (preference != null && !preference.isEmpty()) {
                         // CHECK IF PREFERENCE HAS GUID
                         var guid = preference.get(0).get(prefQuery.getFieldId("GUID"));
-                        if (guid == null) {
+                        if (guid.toString() == null) {
                                 // IF GUID IS NULL PUT SYSTEM DEFAULT INSIDE
+                                System.out.println("GEHT REIN");
                                 var queryPreferenceNewValue = new Query.QueryBuilder(formUserPref).addFieldValue("GUID", 364000001, new Value(sysdefGUID)).build();                               
-                                var pref = api.queryFieldsById("\'2\'==\"" + api.getUser() + "\"", queryPreferenceNewValue.getFieldIds(), formUserPref, null, 0, 0);
+                                var pref = api.queryFieldsById("\'2\'==\"ext_GedikSa\"", queryPreferenceNewValue.getFieldIds(), formUserPref, null, 0, 0);
                                 api.modifyEntry(pref.get(0).getEntryId(), queryPreferenceNewValue);
-                        }
+                        }              
                 } else {
                         // IF USER HAS NO PREFERENCES CREATE NEW ENTRY WITH PREFERENCES AND SYSDEF GUID
                         createUserPreference(sysdefGUID);
                 }
 
+                preference = api.queryFieldsById("\'2\'==\"ext_GedikSa\"", prefQuery.getFieldIds(), formUserPref, null, 0, 0);
+                
                 // INIT ALL PRESETS
                 getAll();
                 response.setPresets(this.presets);
@@ -118,12 +121,10 @@ public class Presets {
                 var queryP = new Query.QueryBuilder(formUserPref)
                                 .addFieldValue("GUID", 364000001, new Value(guid.getGuid())).build();
 
-                var pref = api.queryFieldsById("\'2\'==\"" + api.getUser() + "\"", queryP.getFieldIds(), formUserPref,
+                var pref = api.queryFieldsById("\'2\'==\"ext_GedikSa\"", queryP.getFieldIds(), formUserPref,
                                 null, 0,
                                 0);
 
-                System.out.println(pref);
-
                 if (pref.isEmpty() || pref == null)
                         return false;