diff --git a/rolling-shutter/keyperimpl/shutterservice/eventtriggerregisteredprocessor.go b/rolling-shutter/keyperimpl/shutterservice/eventtriggerregisteredprocessor.go
index 071fad07..0f1b42d7 100644
--- a/rolling-shutter/keyperimpl/shutterservice/eventtriggerregisteredprocessor.go
+++ b/rolling-shutter/keyperimpl/shutterservice/eventtriggerregisteredprocessor.go
@@ -124,5 +124,6 @@ func computeEventTriggerIdentity(event *triggerRegistryV1Bindings.Shuttereventtr
 	var buf bytes.Buffer
 	buf.Write(event.IdentityPrefix[:])
 	buf.Write(event.Sender.Bytes())
+	buf.Write(event.TriggerDefinition)
 	return crypto.Keccak256(buf.Bytes())
 }
diff --git a/rolling-shutter/keyperimpl/shutterservice/newblock.go b/rolling-shutter/keyperimpl/shutterservice/newblock.go
index 74b23ec2..65b86eb7 100644
--- a/rolling-shutter/keyperimpl/shutterservice/newblock.go
+++ b/rolling-shutter/keyperimpl/shutterservice/newblock.go
@@ -3,6 +3,7 @@ package shutterservice
 import (
 	"bytes"
 	"context"
+	"encoding/hex"
 	"fmt"
 	"sort"
 
@@ -135,7 +136,7 @@ func (kpr *Keyper) shouldTriggerDecryption(
 		log.Info().
 			Int64("eon", event.Eon).
 			Int64("block-number", event.BlockNumber).
-			Str("identity", string(event.Identity)).
+			Str("identity", hex.EncodeToString(event.Identity)).
 			Str("address", kpr.config.GetAddress().Hex()).
 			Msg("skipping event as not part of keyper set")
 		return false, nil
diff --git a/rolling-shutter/keyperimpl/shutterservice/registrysyncer.go b/rolling-shutter/keyperimpl/shutterservice/registrysyncer.go
index 52e21142..4fdaaef7 100644
--- a/rolling-shutter/keyperimpl/shutterservice/registrysyncer.go
+++ b/rolling-shutter/keyperimpl/shutterservice/registrysyncer.go
@@ -266,7 +266,6 @@ func (s *RegistrySyncer) insertIdentityRegisteredEvents(
 }
 
 func computeIdentity(event *registryBindings.ShutterregistryIdentityRegistered) []byte {
-	// TODO: may need to change this if we want to create identity other way
 	var buf bytes.Buffer
 	buf.Write(event.IdentityPrefix[:])
 	buf.Write(event.Sender.Bytes())