diff --git a/app/controllers/token_permission_types_controller.rb b/app/controllers/token_permission_types_controller.rb
index 458ad69..4e1b33a 100644
--- a/app/controllers/token_permission_types_controller.rb
+++ b/app/controllers/token_permission_types_controller.rb
@@ -2,7 +2,7 @@
 
 
     def index
-        if user_signed_in? && user.organisation.token_permission_types.count > 0
+        if user_signed_in? && current_user.organisation.token_permission_types.count > 0
             @user = current_user
             respond_to do |format|
                 format.html
diff --git a/app/views/users/admin_api_update.html.erb b/app/views/users/admin_api_update.html.erb
index 138e243..e7e94f1 100644
--- a/app/views/users/admin_api_update.html.erb
+++ b/app/views/users/admin_api_update.html.erb
@@ -6,7 +6,6 @@
 
 <%= raw t('org_admin.user_text_html')%>
 <% @users = current_user.organisation.users %>
-<% #@user_roles = @user_roles.uniq_by {|u| u.user_id } %>
     <table id="dmp_table" class="dmp_table tablesorter">
       <thead>
         <tr>
diff --git a/app/views/users/admin_index.html.erb b/app/views/users/admin_index.html.erb
index 138e243..e7e94f1 100644
--- a/app/views/users/admin_index.html.erb
+++ b/app/views/users/admin_index.html.erb
@@ -6,7 +6,6 @@
 
 <%= raw t('org_admin.user_text_html')%>
 <% @users = current_user.organisation.users %>
-<% #@user_roles = @user_roles.uniq_by {|u| u.user_id } %>
     <table id="dmp_table" class="dmp_table tablesorter">
       <thead>
         <tr>