diff --git a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
index 8bbb184..ed30ca4 100644
--- a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
+++ b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
@@ -43,14 +43,14 @@ Public Class ClassAllgemeineFunktionen
             If LoginorOut = "LOGIN" Then
                 Sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME) VALUES ({0},{1},'Process-Manager','{2}','{3}')", USER_ID, 1, My.Application.Info.Version.ToString, Environment.MachineName)
             Else
-                Sql = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager') AND UPPER(MACHINE_NAME) = UPPER('{Environment.MachineName}')"
+                Sql = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager')"
             End If
             If ClassDatabase.Execute_non_Query(Sql, "LOGIN/OUT") = True Then
                 Try
                     If LoginorOut = "LOGOUT" Then
                         If INACTIVITYRecognized = True Then
-                            Dim oSQL As String = $"UPDATE TBDD_USER_LOGIN_OUT SET COMMENT = 'Inactivity Detected' WHERE GUID = (SELECT MAX(GUID) FROM TBDD_USER_LOGIN_OUT 
-                    WHERE USER_ID = {USER_ID} AND MODULE = 'Process-Manager' AND MACHINE_NAME = '{Environment.MachineName}')"
+                            Dim oSQL As String = $"UPDATE TBDD_USER_LOGIN_OUT SET COMMENT = 'Inactivity Detected' WHERE GUID IN (SELECT GUID FROM TBDD_USER_LOGIN_OUT 
+                    WHERE USER_ID = {USER_ID} AND MODULE = 'Process-Manager'"
                             ClassDatabase.Execute_non_Query(Sql, "Inactivity insert")
                         End If
                     End If