diff --git a/main/template/default/layout/layout_2_col.tpl b/main/template/default/layout/layout_2_col.tpl
index 0ce11d0886..f0649febd3 100755
--- a/main/template/default/layout/layout_2_col.tpl
+++ b/main/template/default/layout/layout_2_col.tpl
@@ -155,18 +155,18 @@
                                         {{ 'Progress' | get_lang  }} : {{ grade_book_progress }} %
                                         <br />
                                         {% for badge in grade_book_badge_list %}
+                                            <div class="badge_sidebar">
                                             {% for skill in badge.skills %}
-                                                <div class="badge_sidebar">
                                                 {% if badge.finished %}
                                                     <img class="badge_sidebar_image " src = "{{ skill.web_icon_path }}" />
                                                 {% else %}
                                                     <img class="badge_sidebar_image badge_sidebar_image_transparency" src = "{{ skill.web_icon_path }}" />
                                                 {% endif %}
-                                                </div>
-                                                <div class="badge_sidebar_title">
-                                                {{ skill.name }}
-                                                </div>
+                                                {#<div class="badge_sidebar_title">#}
+                                                {#{{ skill.name }}#}
+                                                {#</div>#}
                                             {% endfor %}
+                                            </div>
                                         {% endfor %}
                                     </li>
                                 </ul>
diff --git a/user_portal.php b/user_portal.php
index 4e38436c99..6fbf581304 100755
--- a/user_portal.php
+++ b/user_portal.php
@@ -380,16 +380,16 @@ if (!empty($courseAndSessions['courses']) && $allow) {
             ;
 
             if ($userFinished) {
-                $objSkill = new Skill();
-                $skills = $category->get_skills();
-                $skillList = [];
-                foreach ($skills as $skill) {
-                    $skillList[] = $objSkill->get($skill['id']);
-                }
-
                 $badgeList[$id]['finished'] = true;
-                $badgeList[$id]['skills'] = $skillList;
             }
+
+            $objSkill = new Skill();
+            $skills = $category->get_skills();
+            $skillList = [];
+            foreach ($skills as $skill) {
+                $skillList[] = $objSkill->get($skill['id']);
+            }
+            $badgeList[$id]['skills'] = $skillList;
         }
     }
     /*