diff --git a/pom.xml b/pom.xml
index cdd0c6d..250c640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-ldap</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
diff --git a/src/main/java/com/primefactorsolutions/model/Employee.java b/src/main/java/com/primefactorsolutions/model/Employee.java
index 0e4d33a..4f5a49e 100644
--- a/src/main/java/com/primefactorsolutions/model/Employee.java
+++ b/src/main/java/com/primefactorsolutions/model/Employee.java
@@ -13,6 +13,7 @@
     @NoArgsConstructor
     @EqualsAndHashCode(callSuper = true)
     public class Employee extends BaseEntity {
+        private String userName;
         private String firstName;
         private String lastName;
         private LocalDate birthday;
diff --git a/src/main/java/com/primefactorsolutions/service/AssessmentService.java b/src/main/java/com/primefactorsolutions/service/AssessmentService.java
index ef865ab..71dd423 100644
--- a/src/main/java/com/primefactorsolutions/service/AssessmentService.java
+++ b/src/main/java/com/primefactorsolutions/service/AssessmentService.java
@@ -4,7 +4,7 @@ import com.primefactorsolutions.model.*;
 import com.primefactorsolutions.repositories.AssessmentRepository;
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
-import lombok.Data;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
@@ -18,7 +18,7 @@ import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Service
-@Data
+@AllArgsConstructor
 @Slf4j
 public class AssessmentService {
 
diff --git a/src/main/java/com/primefactorsolutions/service/CandidateService.java b/src/main/java/com/primefactorsolutions/service/CandidateService.java
index 4b0108d..4c3fefb 100644
--- a/src/main/java/com/primefactorsolutions/service/CandidateService.java
+++ b/src/main/java/com/primefactorsolutions/service/CandidateService.java
@@ -2,14 +2,14 @@ package com.primefactorsolutions.service;
 
 import com.primefactorsolutions.model.Candidate;
 import com.primefactorsolutions.repositories.CandidateRepository;
-import lombok.Data;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.UUID;
 
 @Service
-@Data
+@AllArgsConstructor
 public class CandidateService {
     private final CandidateRepository candidateRepository;
 
diff --git a/src/main/java/com/primefactorsolutions/service/EmployeeService.java b/src/main/java/com/primefactorsolutions/service/EmployeeService.java
index 993eecd..c30f9b8 100644
--- a/src/main/java/com/primefactorsolutions/service/EmployeeService.java
+++ b/src/main/java/com/primefactorsolutions/service/EmployeeService.java
@@ -1,23 +1,32 @@
 package com.primefactorsolutions.service;
 import com.primefactorsolutions.model.Employee;
+import lombok.AllArgsConstructor;
 import org.apache.commons.beanutils.BeanComparator;
 import com.primefactorsolutions.repositories.EmployeeRepository;
-import lombok.Data;
+import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.support.LdapNameBuilder;
 import org.springframework.stereotype.Service;
 
+import javax.naming.Name;
+import javax.naming.directory.*;
 import java.util.List;
 import java.util.UUID;
 import java.util.Optional;
 import java.util.Collections;
 
-
 @Service
-@Data
+@AllArgsConstructor
 public class EmployeeService {
     private final EmployeeRepository employeeRepository;
+    private final LdapTemplate ldapTemplate;
 
-    public EmployeeService(final EmployeeRepository employeeRepository) {
-        this.employeeRepository = employeeRepository;
+    public static final String BASE_DN = "dc=primefactorsolutions,dc=com";
+
+    protected Name buildDn(final Employee employee) {
+        return LdapNameBuilder.newInstance(BASE_DN)
+                .add("ou", "users")
+                .add("uid", employee.getUserName())
+                .build();
     }
 
     public List<Employee> findEmployees(
@@ -42,6 +51,12 @@ public class EmployeeService {
     }
 
     public Employee createOrUpdate(final Employee employee) {
+        if (employee.getId() == null) {
+            final Name dn = buildDn(employee);
+            // ldapClient.bind(dn).attributes(buildAttributes(employee)).execute();
+            ldapTemplate.bind(dn, null, buildAttributes(employee));
+        }
+
         return employeeRepository.save(employee);
     }
 
@@ -49,4 +64,27 @@ public class EmployeeService {
         Optional<Employee> employee = employeeRepository.findById(id);
         return employee.orElse(null);
     }
+
+    private Attributes buildAttributes(final Employee employee) {
+        final Attributes attrs = new BasicAttributes();
+        final BasicAttribute ocattr = new BasicAttribute("objectclass");
+        ocattr.add("top");
+        ocattr.add("person");
+        ocattr.add("organizationalPerson");
+        ocattr.add("inetOrgPerson");
+        attrs.put(ocattr);
+        attrs.put("cn", String.format("%s %s", employee.getFirstName(), employee.getLastName()));
+        attrs.put("sn", String.format("%s %s", employee.getFirstName(), employee.getLastName()));
+        attrs.put("uid", employee.getUserName());
+        attrs.put("userpassword", String.format("%s%s", employee.getUserName(), 123));
+
+        return attrs;
+    }
+
+    public void updatePassword(final Employee employee) {
+        final Attribute attr = new BasicAttribute("userpassword", employee.getUserName() + "123");
+        final ModificationItem item = new ModificationItem(DirContext.REPLACE_ATTRIBUTE, attr);
+
+        ldapTemplate.modifyAttributes(buildDn(employee), new ModificationItem[] {item});
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/primefactorsolutions/service/QuestionService.java b/src/main/java/com/primefactorsolutions/service/QuestionService.java
index 59282b3..81eb4f3 100644
--- a/src/main/java/com/primefactorsolutions/service/QuestionService.java
+++ b/src/main/java/com/primefactorsolutions/service/QuestionService.java
@@ -2,14 +2,14 @@ package com.primefactorsolutions.service;
 
 import com.primefactorsolutions.model.Question;
 import com.primefactorsolutions.repositories.QuestionRepository;
-import lombok.Data;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.UUID;
 
 @Service
-@Data
+@AllArgsConstructor
 public class QuestionService {
     private final QuestionRepository questionRepository;
 
diff --git a/src/main/java/com/primefactorsolutions/views/EmployeeView.java b/src/main/java/com/primefactorsolutions/views/EmployeeView.java
index 6709e6f..8b18f3b 100644
--- a/src/main/java/com/primefactorsolutions/views/EmployeeView.java
+++ b/src/main/java/com/primefactorsolutions/views/EmployeeView.java
@@ -4,6 +4,7 @@ import com.primefactorsolutions.model.Employee;
 import com.primefactorsolutions.service.EmployeeService;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.combobox.ComboBox;
 import com.vaadin.flow.component.html.H2;
 import com.vaadin.flow.component.html.H3;
@@ -44,6 +45,8 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
 
     private final EmployeeService employeeService;
 
+    // TODO: campo usado para registrar al empleado en LDAP. Este campo podria estar en otro form eventualmente.
+    private final TextField userName = createTextField("Username: ", 30, true);
     private final TextField firstName = createTextField("Nombres: ", 30, true);
     private final TextField lastName = createTextField("Apellidos", 30, true);
     private final ComboBox<Employee.Status> status = createStatusComboBox();
@@ -72,10 +75,10 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
     private final H3 ss = new H3("Datos de Contacto de Emergencia");
     private final H3 si = new H3("Foto del Empleado");
 
-
     public EmployeeView(final EmployeeService employeeService) {
         super(Employee.class);
         this.employeeService = employeeService;
+        saveButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
 
         configureComponents();
         assembleLayout();
@@ -214,8 +217,8 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
 
     @Override
     public void setParameter(final BeforeEvent beforeEvent, final String action) {
-        RouteParameters params = beforeEvent.getRouteParameters();
-        String s = params.get("employeeId").orElse(null);
+        final RouteParameters params = beforeEvent.getRouteParameters();
+        final String s = params.get("employeeId").orElse(null);
 
         if ("new".equals(action)) {
             setEntityWithEnabledSave(new Employee());
@@ -226,6 +229,7 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
             UUID employeeId = UUID.fromString(s);
             var employee = employeeService.getEmployee(employeeId);
             setEntityWithEnabledSave(employee);
+
             if ("edit".equals(action) && !s.isEmpty()) {
                 saveButton.setVisible(true);
                 editButton.setVisible(false);
@@ -294,11 +298,10 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
         upload.setVisible(true);
     }
 
-
     @Override
     protected List<Component> getFormComponents() {
         return List.of(
-                mt, fs, firstName, lastName, status, birthday, birthCity, maritalStatus,
+                mt, fs, userName, firstName, lastName, status, birthday, birthCity, maritalStatus,
                 residenceAddress, phoneNumber, personalEmail, position, team, ss, emergencyCName,
                 emergencyCAddress, emergencyCPhone, emergencyCEmail, si, upload, profileImagePreview,
                 saveButton, editButton
diff --git a/src/main/java/com/primefactorsolutions/views/EmployeesListView.java b/src/main/java/com/primefactorsolutions/views/EmployeesListView.java
index e9f3726..fed246b 100644
--- a/src/main/java/com/primefactorsolutions/views/EmployeesListView.java
+++ b/src/main/java/com/primefactorsolutions/views/EmployeesListView.java
@@ -85,8 +85,6 @@ public class EmployeesListView extends Main {
     }
 
     private void refreshGrid() {
-        List<Employee> employees = employeeService.getEmployeeRepository().findAll();
-        table.setItems(employees);
         table.setPagingDataProvider((page, pageSize) -> fetchEmployees((int) page, pageSize));
     }
 
diff --git a/src/main/java/com/primefactorsolutions/views/MainLayout.java b/src/main/java/com/primefactorsolutions/views/MainLayout.java
index 212f388..d96d150 100644
--- a/src/main/java/com/primefactorsolutions/views/MainLayout.java
+++ b/src/main/java/com/primefactorsolutions/views/MainLayout.java
@@ -2,10 +2,13 @@ package com.primefactorsolutions.views;
 
 import com.vaadin.flow.component.applayout.AppLayout;
 import com.vaadin.flow.component.applayout.DrawerToggle;
+import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.html.Footer;
 import com.vaadin.flow.component.html.H1;
 import com.vaadin.flow.component.html.Header;
 import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.orderedlayout.FlexComponent;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.Scroller;
 import com.vaadin.flow.component.sidenav.SideNav;
 import com.vaadin.flow.component.sidenav.SideNavItem;
@@ -37,7 +40,20 @@ public class MainLayout extends AppLayout {
         viewTitle = new H1();
         viewTitle.addClassNames(LumoUtility.FontSize.LARGE, LumoUtility.Margin.NONE);
 
-        addToNavbar(true, toggle, viewTitle);
+        HorizontalLayout
+                header =
+                authContext.getAuthenticatedUser(UserDetails.class)
+                        .map(user -> {
+                            Button logout = new Button("Logout", click -> this.authContext.logout());
+                            Span loggedUser = new Span("Welcome " + user.getUsername());
+                            HorizontalLayout hl = new HorizontalLayout(loggedUser, logout);
+                            hl.setJustifyContentMode(FlexComponent.JustifyContentMode.END);
+                            return hl;
+                        }).orElseGet(HorizontalLayout::new);
+        header.setAlignItems(FlexComponent.Alignment.STRETCH);
+        header.setWidthFull();
+
+        addToNavbar(true, toggle, viewTitle, header);
     }
 
     private void addDrawerContent() {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 39a0612..f88aa2f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,6 +17,11 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 
+spring.ldap.url=ldap://localhost:8389
+spring.ldap.base=
+spring.ldap.username=
+spring.ldap.password=
+
 spring.ldap.embedded.ldif=classpath:test-server.ldif
 spring.ldap.embedded.base-dn=dc=primefactorsolutions,dc=com
 spring.ldap.embedded.port=8389
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index 0888a8a..ae045c3 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -9,19 +9,19 @@ insert into ASSESSMENT_QUESTIONS (assessment_id, question_id) values ('46b153f4-
 
 insert into ASSESSMENT_QUESTIONS (assessment_id, question_id) values ('46b153f4-23fd-462f-8430-fbe67b83caab', '8a4b213c-ca81-4c38-b56d-d7028c2dde88');
 
-insert into employee (id, version, first_name, last_name, status) values ('e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 1, 'Juan', 'Perez Condori', 'INACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 1, 'Ana', 'Garcia Rojas', 'ACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 1, 'Carlos', 'Lopez Mendoza', 'INACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 1, 'Maria', 'Fernandez Villca', 'ACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('afc5c741-f70a-4394-853b-39d51b118927', 1, 'Luis', 'Gutierrez Mamani', 'ACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 1, 'Laura', 'Martinez Paredes', 'INACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('6e6a8a4e-9f6b-44eb-8c69-40acfdc86756', 1, 'Roberto', 'Santos Escobar', 'ACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('36b0d1c6-bdc0-4d98-94bb-08b9bce3f0d5', 1, 'Valeria', 'Morales Ochoa', 'INACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('5a1c6d80-58b3-43e3-a5a5-24b4a2d1d54a', 1, 'Jorge', 'Ramirez Tapia', 'ACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('9d6a5b2e-6d0b-4b89-8d6a-d3f3d1bfc047', 1, 'Sandra', 'Torres Huanca', 'ACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('f8b3e0c0-0d5a-4e5c-bf9d-207b9b5e8279', 1, 'Felipe', 'Quispe Huanca', 'INACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 1, 'Gabriela', 'Rivas Arana', 'ACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('62d3c1b7-815e-4e96-8d7e-f8c4236bca55', 1, 'Oscar', 'Flores Quiroga', 'INACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('f20b7c5a-5a67-44f0-9ec1-4c1b8e80de05', 1, 'Marta', 'Vargas Soria', 'ACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('19b5a76e-d7b1-4b76-8b02-4d0748e85809', 1, 'Andres', 'Espinoza Chura', 'INACTIVE');
-insert into employee (id, version, first_name, last_name, status) values ('5c1a7b82-832d-4f24-8377-54b77b91b6a8', 1, 'Carla', 'Villanueva Arce', 'ACTIVE');
\ No newline at end of file
+insert into employee (id, version, user_name, first_name, last_name, status) values ('e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 1, 'jperez', 'Juan', 'Perez Condori', 'INACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 1, 'agarcia', 'Ana', 'Garcia Rojas', 'ACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 1, 'clopez', 'Carlos', 'Lopez Mendoza', 'INACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 1, 'mfernandez', 'Maria', 'Fernandez Villca', 'ACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('afc5c741-f70a-4394-853b-39d51b118927', 1, 'lgutierrez', 'Luis', 'Gutierrez Mamani', 'ACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 1, 'lmartinez', 'Laura', 'Martinez Paredes', 'INACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('6e6a8a4e-9f6b-44eb-8c69-40acfdc86756', 1, 'rsantos', 'Roberto', 'Santos Escobar', 'ACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('36b0d1c6-bdc0-4d98-94bb-08b9bce3f0d5', 1, 'vmorales', 'Valeria', 'Morales Ochoa', 'INACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('5a1c6d80-58b3-43e3-a5a5-24b4a2d1d54a', 1, 'jramirez', 'Jorge', 'Ramirez Tapia', 'ACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('9d6a5b2e-6d0b-4b89-8d6a-d3f3d1bfc047', 1, 'storres', 'Sandra', 'Torres Huanca', 'ACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('f8b3e0c0-0d5a-4e5c-bf9d-207b9b5e8279', 1, 'fquispe', 'Felipe', 'Quispe Huanca', 'INACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 1, 'grivas', 'Gabriela', 'Rivas Arana', 'ACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('62d3c1b7-815e-4e96-8d7e-f8c4236bca55', 1, 'oflores', 'Oscar', 'Flores Quiroga', 'INACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('f20b7c5a-5a67-44f0-9ec1-4c1b8e80de05', 1, 'mvargas', 'Marta', 'Vargas Soria', 'ACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('19b5a76e-d7b1-4b76-8b02-4d0748e85809', 1, 'aespinoza', 'Andres', 'Espinoza Chura', 'INACTIVE');
+insert into employee (id, version, user_name, first_name, last_name, status) values ('5c1a7b82-832d-4f24-8377-54b77b91b6a8', 1, 'cvillanueva', 'Carla', 'Villanueva Arce', 'ACTIVE');
\ No newline at end of file