diff --git a/views/default_views/signup_user_admin_list.view.php b/views/default_views/signup_user_admin_list.view.php
index ebfb23e..81a39b9 100644
--- a/views/default_views/signup_user_admin_list.view.php
+++ b/views/default_views/signup_user_admin_list.view.php
@@ -79,7 +79,7 @@ $handler->override_option('fields', array(
     'id' => 'edit_link',
     'table' => 'signup_log',
     'field' => 'edit_link',
-    'relationship' => 'nid',
+    'relationship' => 'none',
   ),
 ));
 $handler->override_option('arguments', array(
diff --git a/views/handlers/signup_handler_field_signup_edit_link.inc b/views/handlers/signup_handler_field_signup_edit_link.inc
index ee8158d..38e6274 100644
--- a/views/handlers/signup_handler_field_signup_edit_link.inc
+++ b/views/handlers/signup_handler_field_signup_edit_link.inc
@@ -13,6 +13,10 @@ class signup_handler_field_signup_edit_link extends views_handler_field_node_lin
       'table' => 'signup_log',
       'field' => 'uid',
     );
+    $this->additional_fields['nid'] = array(
+      'table' => 'signup_log',
+      'field' => 'nid',
+    );
   }
 
   function render($values) {
@@ -20,11 +24,9 @@ class signup_handler_field_signup_edit_link extends views_handler_field_node_lin
 
     // Check access to edit this signup.
     $signup = new stdClass();
-    $signup->sid = $this->get_value($values, 'sid');
-    $signup->uid = $this->get_value($values, 'uid');
-
-    $node = $this->get_value($values);
-    $signup->nid = $node->nid;
+    $signup->sid = $values->{$this->aliases['sid']};
+    $signup->nid = $values->{$this->aliases['nid']};
+    $signup->uid = $values->{$this->aliases['uid']};
 
     if (!_signup_menu_signup_access($signup, 'edit')) {
       return;