diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.cpp b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.cpp
index e641900..adb2344 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/services/AuthenticationManagementService.cpp b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/AuthenticationManagementService.cpp
index 91dd003..7f7e3e8 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/AuthenticationManagementService.cpp
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/AuthenticationManagementService.cpp
@@ -27,3 +27,8 @@ User* AuthenticationManagementService::getAuthenticatedUser()
 {
 	return m_authenticatedUser;
 }
+
+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()