diff --git a/controllers/enquiries_controller.php b/controllers/enquiries_controller.php
index 58f25c88..9c22d1a0 100755
--- a/controllers/enquiries_controller.php
+++ b/controllers/enquiries_controller.php
@@ -49,8 +49,6 @@ class EnquiriesController extends AppController {
 	foreach($enquiry['Email'] as $email) {
 	    $emailIDs[] = $email['id'];
 	}
-
-
 	$emails = $this->Enquiry->Email->find('all', array('conditions'=>array('Email.id'=>$emailIDs)));
 
 	$this->set('emails', $emails);
@@ -489,7 +487,7 @@ class EnquiriesController extends AppController {
 	    }
 
 	    $customerFields = array('Customer.id', 'Customer.name');
-	    $enquiryFields = array('Enquiry.id', 'Enquiry.title', 'Customer.name', 'Customer.id');
+	    $enquiryFields = array('Enquiry.id', 'Enquiry.title','Enquiry.created','Principle.short_name', 'Principle.name', 'Customer.name', 'Customer.id', 'Contact.first_name','Contact.last_name', 'Contact.id');
 	    $contactFields = array('Contact.id', 'Contact.type','Contact.customer_id', 'Contact.first_name','Contact.last_name', 'Customer.name');
 
 
diff --git a/controllers/users_controller.php b/controllers/users_controller.php
index d71fe0df..87821234 100755
--- a/controllers/users_controller.php
+++ b/controllers/users_controller.php
@@ -2,7 +2,7 @@
 class UsersController extends AppController {
 
     var $name = 'Users';
-    var $helpers = array('Html', 'Form');
+    var $helpers = array('Html', 'Form', 'Javascript', 'Text');
     var $components = array('Acl','Auth', 'Cookie');
     var $paginate = array(
 	    'Users' => array('order' => array('User.id' => 'desc'),
@@ -79,6 +79,15 @@ class UsersController extends AppController {
 	$user = $this->User->read(null, $id);
 	$this->set('user', $user);
 
+	$emailIDs = array();
+	foreach($user['Email'] as $email) {
+	    $emailIDs[] = $email['id'];
+	}
+	$emails = $this->User->Email->find('all', array('conditions'=>array('Email.id'=>$emailIDs)));
+	$this->set('emails', $emails);
+
+
+
 	switch($user['User']['type']) {
 	    case 'contact':
 		$this->render('viewContact');
diff --git a/views/enquiries/do_search.ctp b/views/enquiries/do_search.ctp
index bace476a..724b3442 100755
--- a/views/enquiries/do_search.ctp
+++ b/views/enquiries/do_search.ctp
@@ -70,13 +70,12 @@
         </td>
         <td><?php echo $html->link($enquiryRes['Enquiry']['title'], array('controller'=>'enquiries', 'action'=>'view', $enquiryRes['Enquiry']['id'])); ?></td>
         <td> <?php echo $html->link($enquiryRes['Customer']['name'], array('controller'=> 'customers', 'action'=>'view', $enquiryRes['Customer']['id'])); ?></td>
-        <td> <?php echo $html->link($enquiryRes['Contact']['first_name'].' '.$enquiryRes['Contact']['last_name'], array('controller'=> 'contacts', 'action'=>'view', $enquiryRes['Contact']['id'])); ?></td>
+        <td> <?php echo $html->link($enquiryRes['Contact']['first_name'].' '.$enquiryRes['Contact']['last_name'], array('controller'=> 'users', 'action'=>'view', $enquiryRes['Contact']['id'])); ?></td>
         <td><?php echo $html->link('View', array('controller'=>'enquiries', 'action'=>'view', $enquiryRes['Enquiry']['id'])); ?></td>
     </tr>
         <?php endforeach; ?>
 
 </table>
-
 <?php endif;?>
 
 
@@ -136,8 +135,8 @@
     ?>
         <td><?php echo $contact['Contact']['first_name'];?></td>
         <td><?php echo $contact['Contact']['last_name'];?></td>
-        <td><?php echo $html->link($contact['Customer']['name'], array('controller'=> 'customers', 'action'=>'view', $contact['Customer']['id'])); ?></td>
-        <td><?php echo $html->link(__('View', true), array('controller'=>'contacts', 'action'=>'view', $contact['Contact']['id'])); ?></td>
+        <td><?php echo $html->link($contact['Customer']['name'], array('controller'=> 'customers', 'action'=>'view', $contact['Contact']['customer_id'])); ?></td>
+        <td><?php echo $html->link(__('View', true), array('controller'=>'users', 'action'=>'view', $contact['Contact']['id'])); ?></td>
     </tr>
     <?php
     $i++;
diff --git a/views/users/view_user.ctp b/views/users/view_user.ctp
index 0a0748ee..8253dc64 100644
--- a/views/users/view_user.ctp
+++ b/views/users/view_user.ctp
@@ -46,3 +46,12 @@
 		</ul>
 	</div>
 </div>
+
+
+<div class="related">
+    <h3>
+ Emails From this User<?php echo $html->image('internet-mail.png'); ?>
+    </h3>
+<?php echo $this->element('email_table_ajax', array('emails' => $emails)); ?>
+<?php //echo $this->element('email_table_ajax', $enquiry, array('cache'=>'+1 day')); ?>
+</div>