diff --git a/app/controllers/subprojects_controller.rb b/app/controllers/subprojects_controller.rb
index 48fcb94..f33efad 100644
--- a/app/controllers/subprojects_controller.rb
+++ b/app/controllers/subprojects_controller.rb
@@ -3,7 +3,7 @@ class SubprojectsController < ApplicationController
 
   # GET /subprojects or /subprojects.json
   def index
-    @subprojects = Subproject.all
+    @subprojects = Subproject.includes(:client).all
   end
 
   # GET /subprojects/1 or /subprojects/1.json
diff --git a/app/views/subprojects/_subproject.html.erb b/app/views/subprojects/_subproject.html.erb
index a28b72c..341780b 100644
--- a/app/views/subprojects/_subproject.html.erb
+++ b/app/views/subprojects/_subproject.html.erb
@@ -11,17 +11,17 @@
 
   <p>
     <strong>Client:</strong>
-    <%= subproject.client_id %>
+    <%= link_to "#{subproject.client&.company_name} (#{subproject.client&.lastname}, #{subproject.client&.firstname})", client_path(subproject.client&.id) %>
   </p>
 
   <p>
     <strong>Owner:</strong>
-    <%= subproject.owner_id %>
+    <%= link_to "#{subproject.owner&.company_name} (#{subproject.owner&.lastname}, #{subproject.owner&.firstname})", client_path(subproject.owner&.id) %>
   </p>
 
   <p>
     <strong>Builder:</strong>
-    <%= subproject.builder_id %>
+    <%= link_to "#{subproject.builder&.company_name} (#{subproject.builder&.lastname}, #{subproject.builder&.firstname})", client_path(subproject.builder&.id) %>
   </p>
 
 </div>