diff --git a/src/main/java/com/application/munera/facades/PersonFacade.java b/src/main/java/com/application/munera/facades/PersonFacade.java
index 8339417..f7dd58d 100644
--- a/src/main/java/com/application/munera/facades/PersonFacade.java
+++ b/src/main/java/com/application/munera/facades/PersonFacade.java
@@ -39,6 +39,15 @@ public class PersonFacade {
         return Objects.requireNonNull(personService.findByUsername(user.getUsername()));
     }
 
+    /**
+     * Fetches all the people related to the user
+     * @param userId the id of the user related to the people
+     * @return the list of people found related to the id of the user
+     */
+    public List<Person> findAllByUserId(Long userId) {
+        return this.personService.findAllByUserId(userId);
+    }
+
     /**
      * Finds a {@link Person} entity by its ID.
      *
diff --git a/src/main/java/com/application/munera/services/PersonService.java b/src/main/java/com/application/munera/services/PersonService.java
index bab9617..8f3bc7b 100644
--- a/src/main/java/com/application/munera/services/PersonService.java
+++ b/src/main/java/com/application/munera/services/PersonService.java
@@ -35,7 +35,7 @@ public class PersonService {
     }
 
     /**
-     * Finds all persons.
+     * Finds all people.
      * @return a collection of all persons
      */
     public List<Person> findAllByUserId(Long userId) {
diff --git a/src/main/java/com/application/munera/views/expenses/ExpensesView.java b/src/main/java/com/application/munera/views/expenses/ExpensesView.java
index 81584c6..2c6ae27 100644
--- a/src/main/java/com/application/munera/views/expenses/ExpensesView.java
+++ b/src/main/java/com/application/munera/views/expenses/ExpensesView.java
@@ -1,8 +1,14 @@
 package com.application.munera.views.expenses;
 
-import com.application.munera.data.*;
-import com.application.munera.security.SecurityUtils;
-import com.application.munera.services.*;
+import com.application.munera.data.Category;
+import com.application.munera.data.Expense;
+import com.application.munera.data.PeriodUnit;
+import com.application.munera.data.Person;
+import com.application.munera.facades.PersonFacade;
+import com.application.munera.services.CategoryService;
+import com.application.munera.services.ExpenseService;
+import com.application.munera.services.UserService;
+import com.application.munera.services.ViewsService;
 import com.application.munera.views.MainLayout;
 import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.button.Button;
@@ -30,8 +36,6 @@ import com.vaadin.flow.router.*;
 import jakarta.annotation.security.PermitAll;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.orm.ObjectOptimisticLockingFailureException;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.vaadin.klaudeta.PaginatedGrid;
 
 import java.math.BigDecimal;
@@ -59,8 +63,8 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
     private Long userId;
 
     private final ExpenseService expenseService;
+    private final PersonFacade personFacade;
     private final CategoryService categoryService;
-    private final PersonService personService;
     private final ViewsService viewsService;
     private final UserService userService;
     private TextField name;
@@ -76,13 +80,13 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
     private ComboBox<Person> beneficiary;
 
     @Autowired
-    public ExpensesView(ExpenseService expenseService, CategoryService categoryService, PersonService personService, ViewsService viewsService, UserService userService) {
+    public ExpensesView(ExpenseService expenseService, CategoryService categoryService, ViewsService viewsService, UserService userService, PersonFacade personFacade) {
         this.expenseService = expenseService;
         this.categoryService = categoryService;
-        this.personService = personService;
         this.viewsService = viewsService;
         this.userService =  userService;
-        this.userId = userService.getLoggedInUser().getId();
+        this.personFacade = personFacade;
+        this.userId = this.userService.getLoggedInUser().getId();
         addClassNames("expenses-view");
 
         // Create UI
@@ -242,7 +246,7 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
         Div editorDiv = new Div();
         editorDiv.setClassName("editor");
         editorLayoutDiv.add(editorDiv);
-        final var people = this.personService.findAllByUserId(userId);
+        final var people = this.personFacade.findAllByUserId(userId);
 
         FormLayout formLayout = new FormLayout();
         name = new TextField("Name");
@@ -310,18 +314,9 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
         periodInterval.setVisible(isPeriodicChecked);
     }
 
-    //TODO: check and improve this mess pls
     private void initializeComboBoxes() {
-        // Fetch the logged-in user's Person entity
-        UserDetails userDetails = SecurityUtils.getLoggedInUserDetails();
-        if (userDetails != null) {
-            String username = userDetails.getUsername();
-            final var user = this.userService.findByUsername(username).orElseThrow(() -> new UsernameNotFoundException("User not found"));
-                final var loggedInPerson = personService.findByUsername(user.getUsername());
-                    // Set default values for payer and beneficiary ComboBoxes
-                    payer.setValue(loggedInPerson);
-                    beneficiary.setValue(loggedInPerson);
-
-        }
+        final var loggedInPerson = this.personFacade.getLoggedInPerson();
+        payer.setValue(loggedInPerson);
+        beneficiary.setValue(loggedInPerson);
     }
 }
\ No newline at end of file