diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 4f4122c00..a4eb551d9 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -3,7 +3,7 @@ class SettingsController < ApplicationController
     @old_projects_url = nil
     @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects"  if User.current.logged?
 
-    @add =  Site.add
+    @add =  Site.add.select(:id, :name, :url, :key)
     @personal =
       if User.current.logged?
         arr =[]
@@ -17,6 +17,14 @@ class SettingsController < ApplicationController
       else
         []
       end
-    # @sites = Site.group(:site_type).select(:name, :url, :key)
+
+    @common = []
+    Site.common.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
+      hash = {}
+      site.each {|k, v|
+        hash.merge!("#{k}":  v.to_s.include?("current_user") ? v.split('current_user').join(current_user&.login) : v)
+      }
+      @common << hash
+    end
   end
 end
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder
index fb03c6377..697e1dd5d 100644
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@@ -47,6 +47,7 @@ json.setting do
   json.new_course default_course_links
   json.old_projects_url @old_projects_url
 
+
   json.add do
     json.array! @add, :name, :url, :key
   end
@@ -55,4 +56,7 @@ json.setting do
     json.array! @personal
   end
 
+  json.common do
+    json.array! @common
+  end
 end