diff --git a/core/smn_timers.cpp b/core/smn_timers.cpp
index 14ae4716..ab6f6710 100644
--- a/core/smn_timers.cpp
+++ b/core/smn_timers.cpp
@@ -82,7 +82,9 @@ TimerNatives::~TimerNatives()
 void TimerNatives::OnSourceModAllInitialized()
 {
 	HandleAccess sec;
-	sec.access[HandleAccess_Clone] |= HANDLE_RESTRICT_IDENTITY;
+
+	g_HandleSys.InitAccessDefaults(NULL, &sec);
+	sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY;
 
 	g_TimerType = g_HandleSys.CreateType("Timer", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 }
@@ -230,7 +232,7 @@ static cell_t smn_TriggerTimer(IPluginContext *pCtx, const cell_t *params)
 	HandleSecurity sec;
 	TimerInfo *pInfo;
 
-	sec.pOwner = NULL;
+	sec.pOwner = pCtx->GetIdentity();
 	sec.pIdentity = g_pCoreIdent;
 
 	if ((herr=g_HandleSys.ReadHandle(hndl, g_TimerType, &sec, (void **)&pInfo))
diff --git a/core/smn_usermsgs.cpp b/core/smn_usermsgs.cpp
index 7324ee1a..1d8c0a1e 100644
--- a/core/smn_usermsgs.cpp
+++ b/core/smn_usermsgs.cpp
@@ -79,7 +79,9 @@ UsrMessageNatives::~UsrMessageNatives()
 void UsrMessageNatives::OnSourceModAllInitialized()
 {
 	HandleAccess sec;
-	sec.access[HandleAccess_Delete] |= HANDLE_RESTRICT_IDENTITY;
+
+	g_HandleSys.InitAccessDefaults(NULL, &sec);
+	sec.access[HandleAccess_Delete] = HANDLE_RESTRICT_IDENTITY;
 
 	g_WrBitBufType = g_HandleSys.CreateType("BitBufWriter", this, 0, NULL, NULL, g_pCoreIdent, NULL);
 	g_RdBitBufType = g_HandleSys.CreateType("BitBufReader", this, 0, NULL, &sec, g_pCoreIdent, NULL);