diff --git a/event_log_node/event_log_node.module b/event_log_node/event_log_node.module
index c3837b0..efd76f6 100755
--- a/event_log_node/event_log_node.module
+++ b/event_log_node/event_log_node.module
@@ -84,18 +84,14 @@ function event_log_node_delete($node) {
  */
 function event_log_node_init() {
   if (variable_get('event_log_node_log_views', 1)) {
-    $item = menu_get_item();
-    if (!empty($item['page_callback']) && $item['page_callback'] == 'node_page_view') {
-      $node = node_load(arg(1));
-      if (!empty($node)) {
-        $log = array(
-          'type' => 'node',
-          'operation' => 'view',
-          'description' => (mb_strlen($node->title) > 20 ? mb_substr($node->title, 0, 20) . '...' : $node->title),
-          'ref_numeric' => $node->nid,
-        );
-        event_log_insert($log);
-      }
+    if ($node = menu_get_object()) {
+      $log = array(
+        'type' => 'node',
+        'operation' => 'view',
+        'description' => (mb_strlen($node->title) > 20 ? mb_substr($node->title, 0, 20) . '...' : $node->title),
+        'ref_numeric' => $node->nid,
+      );
+      event_log_insert($log);
     }
   }
 }
diff --git a/event_log_user/event_log_user.module b/event_log_user/event_log_user.module
index 010519b..e709465 100755
--- a/event_log_user/event_log_user.module
+++ b/event_log_user/event_log_user.module
@@ -86,17 +86,13 @@ function event_log_user_delete($account) {
  * Implements hook_init().
  */
 function event_log_user_init() {
-  $item = menu_get_item();
-  if (!empty($item['page_callback']) && $item['page_callback'] == 'user_view_page') {
-    $account = $item['page_arguments'][0];
-    if (!empty($account)) {
-      $log = array(
-        'type' => 'user',
-        'operation' => 'view',
-        'description' => t('%name', array('%name' => $account->name)),
-        'ref_numeric' => $account->uid,
-      );
-      event_log_insert($log);
-    }
+  if ($account = menu_get_object('user')) {
+    $log = array(
+      'type' => 'user',
+      'operation' => 'view',
+      'description' => t('%name', array('%name' => $account->name)),
+      'ref_numeric' => $account->uid,
+    );
+    event_log_insert($log);
   }
 }