diff --git a/include/freerdp/server/shadow.h b/include/freerdp/server/shadow.h
index eb8233a04..540080e57 100644
--- a/include/freerdp/server/shadow.h
+++ b/include/freerdp/server/shadow.h
@@ -64,6 +64,8 @@ typedef int (*pfnShadowEnumMonitors)(MONITOR_DEF* monitors, int maxMonitors);
 
 typedef int (*pfnShadowAuthenticate)(rdpShadowSubsystem* subsystem,
 		const char* user, const char* domain, const char* password);
+typedef BOOL (*pfnShadowClientConnect)(rdpShadowSubsystem* subsystem, rdpShadowClient* client);
+typedef void (*pfnShadowClientDisconnect)(rdpShadowSubsystem* subsystem, rdpShadowClient* client);
 
 typedef int (*pfnShadowSynchronizeEvent)(rdpShadowSubsystem* subsystem, UINT32 flags);
 typedef int (*pfnShadowKeyboardEvent)(rdpShadowSubsystem* subsystem, UINT16 flags, UINT16 code);
@@ -158,6 +160,8 @@ struct _RDP_SHADOW_ENTRY_POINTS
 	pfnShadowExtendedMouseEvent ExtendedMouseEvent; \
 	\
 	pfnShadowAuthenticate Authenticate; \
+	pfnShadowClientConnect ClientConnect; \
+	pfnShadowClientDisconnect ClientDisconnect; \
 	\
 	rdpShadowServer* server
 
diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c
index e332688d9..ce414ec27 100644
--- a/server/shadow/shadow_client.c
+++ b/server/shadow/shadow_client.c
@@ -248,6 +248,11 @@ BOOL shadow_client_post_connect(freerdp_peer* peer)
 		}
 	}
 
+	if (subsystem->ClientConnect)
+	{
+		return subsystem->ClientConnect(subsystem, client);
+	}
+
 	return TRUE;
 }
 
@@ -1074,6 +1079,11 @@ void* shadow_client_thread(rdpShadowClient* client)
 		UpdateSubscriber = NULL;
 	}
 
+	if (peer->connected && subsystem->ClientDisconnect)
+	{
+		subsystem->ClientDisconnect(subsystem, client);
+	}
+
 out:
 	peer->Disconnect(peer);