diff --git a/views/webform.views.inc b/views/webform.views.inc
index 7db6fd4..501b298 100755
--- a/views/webform.views.inc
+++ b/views/webform.views.inc
@@ -15,6 +15,20 @@ function webform_views_data() {
     'title' => t('Webform submissions'),
     'help' => t('Submissions generated from Webform forms.'),
   );
+  $data['webform_submissions']['table']['join'] = array(
+    'node' => array(
+      'table' => 'webform_submissions',
+      'field' => 'nid',      
+      'left_field' => 'nid',
+      'left_table' => 'node',
+    ),
+    'users' => array(
+      'table' => 'webform_submissions',
+      'field' => 'uid',      
+      'left_field' => 'uid',
+      'left_table' => 'users',
+    ),
+  );
 
   // sid
   $data['webform_submissions']['sid'] = array(
@@ -39,9 +53,10 @@ function webform_views_data() {
     'help' => t('The node these submissions were generated from.'),
     'relationship' => array(
       'base' => 'node',
+      'field' => 'nid',
       'handler' => 'views_handler_relationship',
-      'label' => t('Node'),
-      'skip base' => array('node', 'node_revisions'),
+      'label' => t('Webform Node'),
+      'skip base' => array('node_revisions'),
     ),
   );
 
@@ -51,9 +66,10 @@ function webform_views_data() {
     'help' => t('The users who submitted these submissions.'),
     'relationship' => array(
       'base' => 'users',
+      'field' => 'uid',
       'handler' => 'views_handler_relationship',
-      'label' => t('User'),
-      'skip base' => array('users', 'node', 'node_revisions'),
+      'label' => t('Webform Submissions'),
+      'skip base' => array('node_revisions'),
     ),
   );