diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php
index c0d4e69bc7..b31281fc65 100755
--- a/main/lp/learnpath.class.php
+++ b/main/lp/learnpath.class.php
@@ -6775,6 +6775,9 @@ class learnpath
     {
         $return = '';
         foreach ($elements as $key => $item) {
+            if (TOOL_LP_FINAL_ITEM === $item['type']) {
+                $key = 'final_item';
+            }
             if (isset($item['load_data']) || empty($item['data'])) {
                 $item['data'] = $default_data[$item['load_data']];
                 $item['type'] = $default_content[$item['load_data']]['item_type'];
@@ -13507,7 +13510,7 @@ EOD;
         );
         $form->addHtml(
             Display::return_message(
-                get_lang('LPEndStepAddTagsToShowCertificateOrSkillAutomatically') . '</br></br> <b>((certificate))</b> </br> <b>((skill))</b>',
+                get_lang('LPEndStepAddTagsToShowCertificateOrSkillAutomatically').'</br></br> <b>((certificate))</b> </br> <b>((skill))</b>',
                 'normal',
                 false
             )
diff --git a/main/lp/lp_controller.php b/main/lp/lp_controller.php
index e92afb4615..95fc1281dd 100755
--- a/main/lp/lp_controller.php
+++ b/main/lp/lp_controller.php
@@ -102,7 +102,7 @@ $htmlHeadXtra[] = '
         $(".li_container .order_items").click(function(e) {
             var dir = $(this).data("dir");
             var itemId = $(this).data("id");
-            var jItems = $("#lp_item_list li.li_container");
+            var jItems = $("#lp_item_list li.li_container:not(#final_item)");
             var jItem = $("#"+ itemId);
             var index = jItems.index(jItem);
             var total = jItems.length;