diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.cpp b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.cpp
index d536e8a..06fe460 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.cpp
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.cpp
@@ -7,6 +7,7 @@ bool Controller::login(const std::string& username, const std::string& password)
 
 void Controller::logout()
 {
+    m_authenticationManagementService.logout();
 }
 
 void Controller::changePassword(const std::string& newPassword)
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.h b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.h
index 3aabb58..0333e80 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.h
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.h
@@ -2,6 +2,7 @@
 #include "Map.h"
 #include <string>
 #include "Enums.h"
+#include "AuthenticationManagementService.h"
 
 class Service;
 class ComboPackage;
@@ -14,6 +15,8 @@ class Notification;
 
 class Controller
 {
+private:
+    AuthenticationManagementService m_authenticationManagementService;
 public:
     bool login(const std::string& username, const std::string& password);
     void logout();
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/AuthenticationManagementService.cpp b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/AuthenticationManagementService.cpp
index ca07fee..c128d26 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/AuthenticationManagementService.cpp
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/AuthenticationManagementService.cpp
@@ -1,3 +1,8 @@
 #include "AuthenticationManagementService.h"
 
 User* AuthenticationManagementService::m_authenticatedUser = nullptr;
+
+void AuthenticationManagementService::logout()
+{
+	m_authenticatedUser = nullptr;
+}
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.cpp b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.cpp
index 047f471..2e5fc75 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.cpp
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.cpp
@@ -33,6 +33,7 @@ bool CustomerMenu::handleOperation(int choice)
 
 void CustomerMenu::logout()
 {
+	m_controller.logout();
 }
 
 void CustomerMenu::changePassword()