diff --git a/webapp/e2e/features/creategroup.feature b/webapp/e2e/features/create-group.feature
similarity index 100%
rename from webapp/e2e/features/creategroup.feature
rename to webapp/e2e/features/create-group.feature
diff --git a/webapp/e2e/steps/create-group.steps.js b/webapp/e2e/steps/create-group.steps.js
new file mode 100644
index 00000000..93fb1eac
--- /dev/null
+++ b/webapp/e2e/steps/create-group.steps.js
@@ -0,0 +1,68 @@
+const puppeteer = require("puppeteer");
+const { defineFeature, loadFeature } = require("jest-cucumber");
+const setDefaultOptions = require("expect-puppeteer").setDefaultOptions;
+const { expect } = require("expect-puppeteer");
+
+const feature = loadFeature("./features/create-group.feature");
+
+let page;
+let browser;
+
+defineFeature(feature, (test) => {
+  beforeAll(async () => {
+    browser = process.env.GITHUB_ACTIONS
+      ? await puppeteer.launch()
+      : await puppeteer.launch({ headless: false, slowMo: 100 });
+    page = await browser.newPage();
+    setDefaultOptions({ timeout: 10000 });
+
+    await page.goto("http://localhost:3000", {
+      waitUntil: "networkidle0",
+    });
+  });
+  let username;
+  let password;
+  test("The user can create a group", ({ given, when, then }) => {
+    given("A logged-in user", async () => {
+      username = "testuser";
+      password = "Testpassword1";
+      await page.waitForSelector("#login-username");
+      await page.type("#login-username", username);
+      await page.waitForSelector("#login-password");
+      await page.type("#login-password", password);
+      await page.click("button", { text: "Login" });
+      //await page.waitForNavigation({ waitUntil: "networkidle0" });
+    });
+
+    when("I click on the Groups link and create a group", async () => {
+      await page.waitForTimeout(1000);
+
+      await page.click('button[aria-label="Abrir menú"]');
+      await page.click('[data-testid="home-grupos-link"]');
+      //await page.waitForNavigation({ waitUntil: "networkidle0" });
+
+      await page.waitForSelector('[name="name"]');
+      await page.type('[name="name"]', "Test Group");
+      await page.click("button", { text: "Crear" });
+      await page.waitForTimeout(1000);
+    });
+
+    then("The Group should be shown on the My Groups page", async () => {
+      await page.click('button[aria-label="Abrir menú"]');
+      await page.click('[data-testid="home-misgrupos-link"]');
+      //await page.waitForNavigation({ waitUntil: "networkidle0" });
+
+      const groupExists = await page.evaluate(() => {
+        const groupName = "Test Group";
+        const groups = Array.from(document.querySelectorAll("tbody tr td:first-child"));
+        return groups.some(td => td.textContent === groupName);
+      });
+
+      expect(groupExists).toBe(true);
+    });
+  });
+
+  afterAll(async () => {
+    await browser.close();
+  });
+});
diff --git a/webapp/e2e/steps/logout.steps.js b/webapp/e2e/steps/logout.steps.js
index 23521cda..866ce961 100644
--- a/webapp/e2e/steps/logout.steps.js
+++ b/webapp/e2e/steps/logout.steps.js
@@ -40,8 +40,10 @@ defineFeature(feature, (test) => {
 
     when("I click on the Logout link", async () => {
       await page.waitForTimeout(1000);
-      await page.waitForSelector('[data-testid="logout-link"]');
-      await page.click('[data-testid="logout-link"]');
+
+      await page.click('button[aria-label="Abrir menú"]');
+      await page.waitForSelector('[data-testid="home-logout-link"]');
+      await page.click('[data-testid="home-logout-link"]');
       await page.waitForNavigation({ waitUntil: "networkidle0" });
     });
 
diff --git a/webapp/src/components/Nav/Nav.js b/webapp/src/components/Nav/Nav.js
index 2c199845..8009fc19 100644
--- a/webapp/src/components/Nav/Nav.js
+++ b/webapp/src/components/Nav/Nav.js
@@ -336,6 +336,14 @@ const Nav = () => {
                       </Link>
                     </Flex>
                   </Box>
+
+                  <Box>
+                    <Flex flexDirection={"column"}>
+                      <Link onClick={handleLogout} data-testid="home-logout-link">
+                        {t("components.nav.disconnect")}
+                      </Link>
+                    </Flex>
+                  </Box>
                 </Stack>
               </DrawerBody>
             </DrawerContent>