diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 84a04c5ebe6d4e4d5e2c2a27b160b8844f55cfa7..e4f588c6a6007519fbbb96c1020a2a19a6e01a87 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -8,6 +8,9 @@ class UsersController < ApplicationController
     visible_projects = ProjectsFinder.new.execute(current_user)
     authorized_projects_ids = visible_projects.pluck(:id)
 
+    @contributed_projects = Project.where(id: authorized_projects_ids).
+      in_group_namespace
+
     @projects = @user.personal_projects.
       where(id: authorized_projects_ids)
 
diff --git a/app/views/explore/projects/_project.html.haml b/app/views/explore/projects/_project.html.haml
index ffbddbae4d660af054bb665d546afead94fd8cd5..b093ec00c579ab3202a235f12d25ba8082e883a5 100644
--- a/app/views/explore/projects/_project.html.haml
+++ b/app/views/explore/projects/_project.html.haml
@@ -3,11 +3,9 @@
     .project-access-icon
       = visibility_level_icon(project.visibility_level)
     = link_to project.name_with_namespace, project
-
-    - if current_page?(starred_explore_projects_path)
-      %strong.pull-right
-        %i.fa.fa-star
-        = pluralize project.star_count, 'star'
+    %span.pull-right
+      %i.fa.fa-star
+      = project.star_count
 
   .project-info
     - if project.description.present?
diff --git a/app/views/users/_projects.html.haml b/app/views/users/_projects.html.haml
index 1d38f8e8ab8b0838fe723b793feac72d8a1af8e3..c925a48f550d676a63998ffc055f3be086cf1409 100644
--- a/app/views/users/_projects.html.haml
+++ b/app/views/users/_projects.html.haml
@@ -1,6 +1,21 @@
-.panel.panel-default
-  .panel-heading Personal projects
-  %ul.well-list
-    - projects.each do |project|
-      %li
-        = link_to_project project
+- if @contributed_projects.present?
+  .panel.panel-default
+    .panel-heading Projects contributed to
+    %ul.well-list
+      - @contributed_projects.sort_by(&:star_count).reverse.each do |project|
+        %li
+          = link_to_project project
+          %span.pull-right.light
+            %i.fa.fa-star
+            = project.star_count
+
+- if @projects.present?
+  .panel.panel-default
+    .panel-heading Personal projects
+    %ul.well-list
+      - @projects.sort_by(&:star_count).reverse.each do |project|
+        %li
+          = link_to_project project
+          %span.pull-right.light
+            %i.fa.fa-star
+            = project.star_count
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index b05918b019e3d33c944179abee37e3e4f9077dc9..5e82d5780cfb07f9186145623a5ab47bd08caac0 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -35,9 +35,7 @@
     = render @events
   .col-md-4
     = render 'profile', user: @user
-    - if @projects.present?
-      = render 'projects', projects: @projects
-
+    = render 'projects'
 
 :coffeescript
   $ ->