diff --git a/src/app/app.component.html b/src/app/app.component.html
index 0680b43..56ef914 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1 +1,2 @@
+<button (click)="clearAllCookies()">Logout</button>
 <router-outlet></router-outlet>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 7ff1ac2..52418a7 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,4 +1,6 @@
 import { Component } from '@angular/core';
+import {CookieService} from "ngx-cookie-service";
+import {Router} from "@angular/router";
 
 @Component({
   selector: 'app-root',
@@ -7,4 +9,19 @@ import { Component } from '@angular/core';
 })
 export class AppComponent {
   title = 'm-152';
+
+
+  constructor(
+    private cookieService: CookieService,
+    private router: Router,
+  ) {
+  }
+
+  clearAllCookies() {
+    const allCookies = this.cookieService.getAll();
+    for (const cookieName in allCookies) {
+      this.cookieService.delete(cookieName);
+    }
+    this.router.navigate(['/login']);
+  }
 }
diff --git a/src/app/component/login/login.component.html b/src/app/component/login/login.component.html
index e83fc54..eab37ca 100644
--- a/src/app/component/login/login.component.html
+++ b/src/app/component/login/login.component.html
@@ -1,57 +1,44 @@
 <div class="h-screen w-screen flex items-center justify-center">
   <div class="max-w-md py-12">
 
-    <div class="bg-white px-6 py-8 rounded-lg shadow-md w-[400px]" *ngIf="login">
+    <div class="bg-white px-6 py-8 rounded-lg shadow-md w-[400px]">
 
-      <h2 class="text-center text-2xl font-bold mb-8">Accedi</h2>
+      <h2 *ngIf="login" class="text-center text-2xl font-bold mb-8">Accedi</h2>
+      <h2 *ngIf="!login" class="text-center text-2xl font-bold mb-8">Registrati</h2>
 
-      <form>
+      <form (submit)="submit()">
 
         <div class="mb-4">
-          <label for="email" class="block text-gray-700 font-bold mb-2">Email:</label>
-          <input type="email" id="email" name="email" placeholder="Inserisci username"
-                 class="w-full px-4 py-2 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-600 focus:border-transparent">
+          <label for="email" class="block text-gray-700 font-bold mb-2">Username</label>
+          <input type="text" id="email" name="email" placeholder="Inserisci username"
+                 class="w-full px-4 py-2 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-600 focus:border-transparent"
+                 [(ngModel)]="newUser.username">
         </div>
 
         <div class="mb-4">
           <label for="password" class="block text-gray-700 font-bold mb-2">Password:</label>
           <input type="password" id="password" name="password" placeholder="Inserisci la tua password"
-                 class="w-full px-4 py-2 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-600 focus:border-transparent">
+                 class="w-full px-4 py-2 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-600 focus:border-transparent"
+                 [(ngModel)]="newUser.password">
         </div>
 
         <div class="mb-4">
-          <button type="submit" class="btn gap-2 border-primary bg-primary text-secondary hover:bg-secondary hover:text-primary hover:border-primary py-2 w-full">Accedi</button>
+          <button type="submit" class="btn gap-2 border-primary bg-primary text-secondary hover:bg-secondary hover:text-primary hover:border-primary py-2 w-full">
+            <span *ngIf="login">Accedi</span>
+            <span *ngIf="!login">Registrati</span>
+          </button>
         </div>
 
       </form>
 
-    </div>
 
-    <div class="bg-white px-6 py-8 rounded-lg shadow-md w-[400px]" *ngIf="!login">
-
-      <h2 class="text-center text-2xl font-bold mb-8">Registrati</h2>
-
-      <form>
-
-        <div class="mb-4">
-          <label for="emails" class="block text-gray-700 font-bold mb-2">Email:</label>
-          <input type="emails" id="emails" name="email" placeholder="Inserisci username"
-                 class="w-full px-4 py-2 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-600 focus:border-transparent">
-        </div>
-
-        <div class="mb-4">
-          <label for="passwords" class="block text-gray-700 font-bold mb-2">Password:</label>
-          <input type="passwords" id="passwords" name="password" placeholder="Inserisci la tua password"
-                 class="w-full px-4 py-2 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-600 focus:border-transparent">
-        </div>
-
-        <div class="mb-4">
-          <button type="submit" class="btn gap-2 border-primary bg-primary text-secondary hover:bg-secondary hover:text-primary hover:border-primary py-2 w-full">Accedi</button>
-        </div>
-
-      </form>
+      <a (click)="switch()">
+        <span *ngIf="login">Register</span>
+        <span *ngIf="!login">Login</span>
+      </a>
 
     </div>
 
+
   </div>
 </div>
diff --git a/src/app/component/login/login.component.ts b/src/app/component/login/login.component.ts
index ddc84fc..825a47a 100644
--- a/src/app/component/login/login.component.ts
+++ b/src/app/component/login/login.component.ts
@@ -30,23 +30,22 @@ export class LoginComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    if (this.cookieService.getUsername() != null) {
-      this.router.navigate(['/home']);
-    }
+
   }
 
-  createNewUser(username: string, password: string) {
+  createNewUser(createUser: UserEntity) {
+    console.log(createUser.username+" "+createUser.password);
     this.userService.getUsers().subscribe(users => {
       this.users = users;
       for (let i = 0; i < this.users.length; i++) {
-        if (this.users[i].username == username) {
+        if (this.users[i].username == createUser.username) {
           this.errorCreateUser = true;
         }
       }
-      this.newUser.username = username;
-      this.newUser.password = password;
+      this.newUser.username = createUser.username;
+      this.newUser.password = createUser.password;
       this.userService.createUser(this.newUser).subscribe(user => {
-        this.cookieService.setUsername(username);
+        this.cookieService.setUsername(createUser.username);
         this.router.navigate(['/management']);
       });
     });
@@ -63,6 +62,14 @@ export class LoginComponent implements OnInit {
     });
   }
 
+  submit() {
+    if (this.login) {
+      this.loginFunction(this.newUser.username, this.newUser.password);
+    } else {
+      this.createNewUser(this.newUser);
+    }
+  }
+
   switch() {
     if (this.login) {
       this.login = false;
diff --git a/src/app/service/http/user.service.ts b/src/app/service/http/user.service.ts
index 7974fc9..01f40d7 100644
--- a/src/app/service/http/user.service.ts
+++ b/src/app/service/http/user.service.ts
@@ -30,7 +30,9 @@ export class UserService {
   }
 
   createUser(user: UserEntity) {
+    console.log("create "+user);
     return this.http.post<UserEntity>(USER, user);
+
   }
 
   updateUser(user: UserEntity, id: number) {