diff --git a/main/badge/assign.php b/main/badge/assign.php
index b1e63f4452..f37939cfec 100644
--- a/main/badge/assign.php
+++ b/main/badge/assign.php
@@ -28,8 +28,7 @@ $skillRepo = $entityManager->getRepository('ChamiloCoreBundle:Skill');
 $skillRelSkill = $entityManager->getRepository('ChamiloCoreBundle:SkillRelSkill');
 $skillLevelRepo = $entityManager->getRepository('ChamiloSkillBundle:Level');
 $skillUserRepo = $entityManager->getRepository('ChamiloCoreBundle:SkillRelUser');
-/** @var User $user */
-$user = $entityManager->find('ChamiloUserBundle:User', $userId);
+$user = api_get_user_entity($userId);
 
 if (!$user) {
     Display::addFlash(
@@ -184,7 +183,7 @@ if ($form->validate()) {
     exit;
 }
 
-$form->setDefaults(['user_name' => $user->getCompleteName()]);
+$form->setDefaults(['user_name' => $user->getCompleteNameWithUsername()]);
 $form->freeze(['user_name']);
 
 if (api_is_drh()) {
diff --git a/main/inc/ajax/skill.ajax.php b/main/inc/ajax/skill.ajax.php
index c6f0b925ed..1177c52c4f 100755
--- a/main/inc/ajax/skill.ajax.php
+++ b/main/inc/ajax/skill.ajax.php
@@ -77,7 +77,7 @@ switch ($action) {
         break;
     case 'get_course_info_popup':
         $course_info = api_get_course_info($_REQUEST['code']);
-        $courses = CourseManager::process_hot_course_item(
+        $courses = CourseManager::processHotCourseItem(
             [
                 ['c_id' => $course_info['real_id']]
             ]
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 97cfa13072..01b6243368 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -4925,7 +4925,7 @@ class CourseManager
 
         if (Database::num_rows($result)) {
             $courses = Database::store_result($result, 'ASSOC');
-            $courses = self::process_hot_course_item($courses, $my_course_code_list);
+            $courses = self::processHotCourseItem($courses, $my_course_code_list);
         }
 
         return $courses;
@@ -4936,7 +4936,7 @@ class CourseManager
      * @param array $my_course_code_list
      * @return mixed
      */
-    public static function process_hot_course_item($courses, $my_course_code_list = array())
+    public static function processHotCourseItem($courses, $my_course_code_list = array())
     {
         $hotCourses = [];
         $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote';
@@ -4957,42 +4957,12 @@ class CourseManager
                 $my_course_code_list
             );
 
-            $userRegisterdInCourse = self::is_user_subscribed_in_course($user_id, $course_info['code']);
-            $userRegisterdInCourseAsTeacher = self::is_course_teacher($user_id, $course_info['code']);
-            $userRegisterd = ($userRegisterdInCourse && $userRegisterdInCourseAsTeacher);
-
-            $my_course['is_registerd'] = $userRegisterd;
-
+            $userRegisteredInCourse = self::is_user_subscribed_in_course($user_id, $course_info['code']);
+            $userRegisteredInCourseAsTeacher = self::is_course_teacher($user_id, $course_info['code']);
+            $userRegistered = $userRegisteredInCourse && $userRegisteredInCourseAsTeacher;
+            $my_course['is_registered'] = $userRegistered;
             $my_course['title_cut'] = cut($course_info['title'], 45);
-            // if user registered as student
-            /* if ($userRegisterdInCourse) {
-                $icon = '<em class="fa fa-graduation-cap"></em>';
-                $title = get_lang("AlreadyRegisteredToCourse");
-                $my_course['already_register_as'] = Display::tag(
-                    'button',
-                    $icon,
-                    array(
-                        'id' => 'register',
-                        'class' => 'btn btn-default btn-sm',
-                        'title' => $title,
-                        'aria-label' => $title
-                    )
-                );
-            } elseif ($userRegisterdInCourseAsTeacher) {
-                // if user registered as teacher
-                $icon = '<em class="fa fa-suitcase"></em>';
-                $title = get_lang("YouAreATeacherOfThisCourse");
-                $my_course['already_register_as'] = Display::tag(
-                    'button',
-                    $icon,
-                    array(
-                        'id' => 'register',
-                        'class' => 'btn btn-default btn-sm',
-                        'title' => $title,
-                        'aria-label' => $title
-                    )
-                );
-            } */
+
 
             //Course visibility
             if ($access_link && in_array('register', $access_link)) {
diff --git a/main/template/default/layout/hot_course_item.tpl b/main/template/default/layout/hot_course_item.tpl
index 2e3955f422..9efcf54995 100755
--- a/main/template/default/layout/hot_course_item.tpl
+++ b/main/template/default/layout/hot_course_item.tpl
@@ -2,9 +2,8 @@
     {% if item.title %}
         <div class="col-xs-12 col-sm-6 col-md-4">
             <div class="items items-hotcourse">
-                
                 <div class="image">
-                    {% if item.is_registerd %}
+                    {% if item.is_registered %}
                         <a title="{{ item.title}}" href="{{ item.course_public_url }}">
                             <img src="{{ item.course_image_large }}" class="img-responsive" alt="{{ item.title }}">
                         </a>
@@ -19,9 +18,11 @@
                 </div>
                 <div class="description">
                     <div class="block-title">
-                        {% if item.is_registerd %}
+                        {% if item.is_registered or _u.is_admin %}
                             <h4 class="title">
-                                <a alt="{{ item.title }}" title="{{ item.title }}" href="{{ item.course_public_url }}">{{ item.title_cut}}</a>
+                                <a alt="{{ item.title }}" title="{{ item.title }}" href="{{ item.course_public_url }}">
+                                    {{ item.title_cut}}
+                                </a>
                             </h4>
                         {% else %}
                             <h4 class="title" title="{{ item.title }}">
@@ -70,13 +71,13 @@
                                             </a>
                                         </h5>
                                         <p>{{ 'Teacher' | get_lang }}</p>
-                                    </div>                                       
+                                    </div>
                                 {% elseif item.teachers | length <= 6 %}
                                     <a href="{{ teacher.url }}" class="ajax"
                                        data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
                                         <img src="{{ teacher.avatar }}"/>
                                     </a>
-                                {% endif %} 
+                                {% endif %}
                             {% endfor %}
                         {% endif %}
                     </div>