diff --git a/main/calendar/myagenda.inc.php b/main/calendar/myagenda.inc.php
index 49ad8c0e6b..96ef1d92cf 100755
--- a/main/calendar/myagenda.inc.php
+++ b/main/calendar/myagenda.inc.php
@@ -93,7 +93,9 @@ function get_myagendaitems($user_id, $courses_dbs, $month, $year) {
 			
 			$item['url'] = $url;
 			$item['course_name'] = $array_course_info['title'];	
-			$item['calendar_type'] = 'course';			
+			$item['calendar_type'] = 'course';
+			$item['course_id'] = $array_course_info['course_id'];
+			
 			$my_list[$agendaday][] = $item;					
 		}
 	}
@@ -218,23 +220,24 @@ function display_mymonthcalendar($user_id, $agendaitems, $month, $year, $weekday
                         
                         $result = '<div class="rounded_div_agenda" style="background-color:'.$bg_color.';">';
                         
-                        if ($show_content) {
+                        if ($show_content) {                       	                       	
     				        
                             //Setting a personal event to green
-                            $icon = Display::div($icon, array('style'=>'float:right'));                            
+                            $icon = Display::div($icon, array('style'=>'float:right'));      
+
+                            $link = $value['calendar_type'].'_'.$value['id'].'_'.$value['course_id'].'_'.$value['session_id'];
                             
                             //Link to bubble                                                
-                            $url = Display::url(cut($value['title'], 40), '#', array('id'=>$value['calendar_type'].'_'.$value['id'], 'class'=>'opener'));                                 
+                            $url = Display::url(cut($value['title'], 40), '#', array('id'=>$link, 'class'=>'opener'));                                 
                             $result .= $time.' '.$icon.' '.Display::div($url);
                             
                             //Hidden content
-                            $content = Display::div($icon.Display::tag('h1', $value['title']).$complete_time.'<hr />'.Security::remove_XSS($value['content']));
+                            $content = Display::div($icon.Display::tag('h2', $value['course_name']).'<hr />'.Display::tag('h3', $value['title']).$complete_time.'<hr />'.Security::remove_XSS($value['content']));
                             
                             //Main div
-                            $result .= Display::div($content, array('id'=>'main_'.$value['calendar_type'].'_'.$value['id'], 'class' => 'dialog', 'style' => 'display:none'));
+                            $result .= Display::div($content, array('id'=>'main_'.$link, 'class' => 'dialog', 'style' => 'display:none'));
                             $result .= '</div>';                        
-                            echo $result;
-                                                        
+                            echo $result;                                                        
                             //echo Display::div($content, array('id'=>'main_'.$value['calendar_type'].'_'.$value['id'], 'class' => 'dialog'));
                         } else {                        	
                             echo $result .= $icon.'</div>';
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index f62f7b3ba4..6be9bc198b 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -1963,7 +1963,7 @@ class CourseManager {
         }
         
         if (!empty($with_special_courses)) {
-            $sql = "SELECT DISTINCT(course.code), course.db_name db_name, course.title
+            $sql = "SELECT DISTINCT(course.code), course.db_name db_name, course.title , course.id as course_id
                         FROM    ".$tbl_course_user." course_rel_user
                         LEFT JOIN ".$tbl_course." course
                         ON course.code = course_rel_user.course_code
@@ -1984,7 +1984,7 @@ class CourseManager {
 
         // get course list not auto-register. Use Distinct to avoid multiple
         // entries when a course is assigned to a HRD (DRH) as watcher
-        $sql = "SELECT DISTINCT(course.code),course.db_name,course.title
+        $sql = "SELECT DISTINCT(course.code),course.db_name,course.title , course.id as course_id
                 FROM $tbl_course course
                 INNER JOIN $tbl_course_user cru
                 ON course.code=cru.course_code
@@ -2000,7 +2000,7 @@ class CourseManager {
         }
 
         if ($include_sessions === true) {
-            $r = Database::query("SELECT DISTINCT(c.code),c.db_name,c.title
+            $r = Database::query("SELECT DISTINCT(c.code), c.db_name, c.title, c.id as course_id
                     FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)." s, ".Database::get_main_table(TABLE_MAIN_COURSE)." c
                     WHERE id_user = $user_id AND s.course_code=c.code");
             while ($row = Database::fetch_array($r, 'ASSOC')) {