Changed trigger to push using UserId instead of PushToken