diff --git a/app/controllers/user_certifications_controller.rb b/app/controllers/user_certifications_controller.rb
index 6d222ee..aff149a 100644
--- a/app/controllers/user_certifications_controller.rb
+++ b/app/controllers/user_certifications_controller.rb
@@ -6,7 +6,7 @@ class UserCertificationsController < ApplicationController
 
   # Load users and certs based on current ability
   before_filter :only => [:new, :edit, :create, :update] do
-    @users = User.where(:hidden => false).accessible_by(current_ability).sort_by(&:name)
+    @users = User.where(:hidden => [false,nil]).accessible_by(current_ability).sort_by(&:name)
     @certifications = Certification.accessible_by(current_ability).sort_by(&:name)
   end
   
diff --git a/app/views/certifications/show.html.erb b/app/views/certifications/show.html.erb
index 272deae..c9fce2b 100644
--- a/app/views/certifications/show.html.erb
+++ b/app/views/certifications/show.html.erb
@@ -8,13 +8,10 @@
   <%= simple_format @certification.description %>
 </p>
 
-<b>Certified Users:</b>
-<ul>
-  <% @certification_users.each do |user| %>
-      <li><%= link_to user.name, user %></li>
-  <% end %>
-  <% if @certification_users.blank? then %><li>n/a</li><% end %>
-</ul>
+<p>
+  <b>Certified Users:</b>
+  <%= link_to "Click Here", user_certifications_path %>
+</p>
 
 <% if can? :update, @certification %><%= link_to 'Edit', edit_certification_path(@certification) %> |<% end %>
 <%= link_to 'Back', certifications_path %>
diff --git a/app/views/user_certifications/show.html.erb b/app/views/user_certifications/show.html.erb
index d12c3be..66b4b5f 100644
--- a/app/views/user_certifications/show.html.erb
+++ b/app/views/user_certifications/show.html.erb
@@ -1,6 +1,6 @@
 <p>
   <b>User:</b>
-  <%= @user_certification.user.name %>
+  <%= link_to @user_certification.user.name, @user_certification.user %>
 </p>
 
 <p>