diff --git a/main/inc/lib/course_home.lib.php b/main/inc/lib/course_home.lib.php
index b95e9693cc..fd29e9c979 100644
--- a/main/inc/lib/course_home.lib.php
+++ b/main/inc/lib/course_home.lib.php
@@ -622,6 +622,8 @@ class CourseHome {
             foreach ($all_tools_list as & $tool) {
                 $item = array();
 
+                $tool['original_link'] = $tool['link'];
+
                 if ($tool['image'] == 'scormbuilder.gif') {
                     // display links to lp only for current session
                     if (api_get_session_id() != $tool['session_id']) {
@@ -703,7 +705,7 @@ class CourseHome {
                 $tool_link_params = array();
 
                 //$tool['link'] = htmlspecialchars($tool['link']) ;
-
+                //@todo this visio stuff should be removed
                 if (strpos($tool['name'],'visio_') !== false) {
                     $tool_link_params = array('id'      => 'tooldesc_'.$tool["id"],
                                               'href'    => '"javascript: void(0);"',
@@ -734,11 +736,15 @@ class CourseHome {
 
                 $tool_name = self::translate_tool_name($tool);
 
+                // Including Courses Plugins
+                // Creating title and the link
+
                 if (isset($tool['category']) &&  $tool['category'] == 'plugin') {
                     $plugin_info = $app_plugin->get_plugin_info($tool['name']);
                     if (isset($plugin_info) && isset($plugin_info['title'])) {
                         $tool_name = $plugin_info['title'];
                     }
+                    $tool_link_params['href'] = api_get_path(WEB_PLUGIN_PATH).$tool['original_link'].'?'.api_get_cidreq();
                 }
 
                 $icon = Display::return_icon($tool['image'], $tool_name, array('class' => 'tool-icon', 'id' => 'toolimage_'.$tool['id']), ICON_SIZE_BIG, false);
diff --git a/main/inc/lib/plugin.class.php b/main/inc/lib/plugin.class.php
index 468a0ffabb..bad977183c 100644
--- a/main/inc/lib/plugin.class.php
+++ b/main/inc/lib/plugin.class.php
@@ -225,7 +225,7 @@ class Plugin {
         $sql = "SELECT name FROM $t_tool WHERE c_id = $course_id AND name = '$plugin_name' ";
         $result = Database::query($sql);
         if (!Database::num_rows($result)) {
-            $tool_link = "../../plugin/$plugin_name/start.php";
+            $tool_link = "$plugin_name/start.php";
             $visibility = string2binary(api_get_setting('course_create_active_tools', $plugin_name));
             $sql_course = "INSERT INTO $t_tool VALUES ($course_id, NULL, '$plugin_name', '$tool_link', '$plugin_name.png',' ".$visibility."','0', 'squaregrey.gif','NO','_self','plugin','0')";
             $r = Database::query($sql_course);