diff --git a/app/models/diploma.rb b/app/models/diploma.rb
index eaba4e6..5a92afa 100644
--- a/app/models/diploma.rb
+++ b/app/models/diploma.rb
@@ -42,8 +42,8 @@ class Diploma
   def self.get_plugin_datas_to_member(datas)
 
     fields_to_show = [
-      "school_name",
       "country",
+      "school_name",
       "department",
       "degree",
       "duration"
@@ -60,7 +60,7 @@ class Diploma
       pd_data = []
       fields_to_show.collect do |t|
         if t == "school_name"
-          pd_data << { "data_title" => "<a href='#{OrbitHelper.url_to_plugin_show(p.to_param,'personal_diploma')}' target='_blank'>#{p.send(t)}" }
+          pd_data << { "data_title" => "<a href='#{OrbitHelper.url_to_plugin_show(p.to_param,'personal_diploma')}' target='_blank'>#{p.send(t)}</a>" }
         elsif t == "duration"
           if !p.send('start_date').nil? or !p.send('end_date').nil?
            date = (p.send('start_date').strftime('%Y.%m') rescue "")+' ~ '+(p.send('end_date').strftime('%Y.%m') rescue I18n.t('personal_diploma.up_to_today'))