diff --git a/main/img/splash.png b/main/img/splash.png
new file mode 100644
index 0000000000..6cc86a506f
Binary files /dev/null and b/main/img/splash.png differ
diff --git a/main/inc/banner.inc.php b/main/inc/banner.inc.php
index 30e250db19..4bb4fe7f48 100755
--- a/main/inc/banner.inc.php
+++ b/main/inc/banner.inc.php
@@ -128,6 +128,13 @@ if ($_user['user_id'] && isset($_cid)) {
 	}
 }
 
+
+if (api_get_setting('show_link_bug_notification') == 'true') { ?>
+
+    <li>|<a href="http://support.chamilo.org/projects/chamilo-18/" target="_blank"><img src="<?php echo api_get_path(WEB_IMG_PATH) ?>splash.png" style="vertical-align: middle;" alt="<?php echo get_lang('ReportABug') ?>"/>&nbsp;<?php echo get_lang('ReportABug') ?></li></a>
+
+<?php }
+
 if (api_is_allowed_to_edit()) {
 	if (!empty($help)) {
 	// Show help
diff --git a/main/install/db_main.sql b/main/install/db_main.sql
index 21c98b3a6f..13b65ca1b6 100755
--- a/main/install/db_main.sql
+++ b/main/install/db_main.sql
@@ -760,7 +760,8 @@ VALUES
 ('use_users_timezone', 'timezones', 'radio', 'Timezones', 'true', 'UseUsersTimezoneTitle','UseUsersTimezoneComment',NULL,'Timezones', 1),
 ('timezone_value', 'timezones', 'select', 'Timezones', '', 'TimezoneValueTitle','TimezoneValueComment',NULL,'Timezones', 1),
 ('allow_user_course_subscription_by_course_admin', NULL, 'radio', 'Security', 'true', 'AllowUserCourseSubscriptionByCourseAdminTitle', 'AllowUserCourseSubscriptionByCourseAdminComment', NULL, NULL, 1),
-('dokeos_database_version', NULL, 'textfield', NULL,'1.8.7.11220','DokeosDatabaseVersion','',NULL,NULL,0);
+('show_link_bug_notification', NULL, 'radio', 'Platform', 'true', 'ShowLinkBugNotificationTitle', 'ShowLinkBugNotificationComment', NULL, NULL, 0),
+('dokeos_database_version', NULL, 'textfield', NULL,'1.8.7.11502','DokeosDatabaseVersion','',NULL,NULL,0);
 
 
 UNLOCK TABLES;
@@ -972,7 +973,9 @@ VALUES
 ('use_users_timezone', 'true', 'Yes'),
 ('use_users_timezone', 'false', 'No'),
 ('allow_user_course_subscription_by_course_admin', 'true', 'Yes'),
-('allow_user_course_subscription_by_course_admin', 'false', 'No');
+('allow_user_course_subscription_by_course_admin', 'false', 'No'),
+('show_link_bug_notification', 'true', 'Yes'),
+('show_link_bug_notification', 'false', 'No');
 
 UNLOCK TABLES;
 
diff --git a/main/install/migrate-db-1.8.6.2-1.8.7-pre.sql b/main/install/migrate-db-1.8.6.2-1.8.7-pre.sql
index c624007a20..edfe533226 100755
--- a/main/install/migrate-db-1.8.6.2-1.8.7-pre.sql
+++ b/main/install/migrate-db-1.8.6.2-1.8.7-pre.sql
@@ -67,7 +67,7 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value,
 ALTER TABLE user_field_values CHANGE id id BIGINT NOT NULL AUTO_INCREMENT;
 ALTER TABLE user_field_values ADD INDEX (user_id, field_id);
 
-UPDATE settings_current SET selected_value = '1.8.7.11220' WHERE variable = 'dokeos_database_version';
+UPDATE settings_current SET selected_value = '1.8.7.11502' WHERE variable = 'dokeos_database_version';
 
 ALTER TABLE course_rel_user DROP PRIMARY KEY, ADD PRIMARY KEY (course_code, user_id, relation_type);
 ALTER TABLE session_rel_user DROP PRIMARY KEY, ADD PRIMARY KEY (id_session, id_user, relation_type);
@@ -81,6 +81,10 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value,
 INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_user_course_subscription_by_course_admin', 'true', 'Yes');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_user_course_subscription_by_course_admin', 'false', 'No');
 
+INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('show_link_bug_notification', NULL, 'radio', 'Platform', 'true', 'ShowLinkBugNotificationTitle', 'ShowLinkBugNotificationComment', NULL, NULL, 0);
+INSERT INTO settings_options (variable, value, display_text) VALUES ('show_link_bug_notification', 'true', 'Yes');
+INSERT INTO settings_options (variable, value, display_text) VALUES ('show_link_bug_notification', 'false', 'No');
+
 -- xxSTATSxx
 CREATE TABLE track_e_item_property(id int NOT NULL auto_increment PRIMARY KEY, course_id int NOT NULL, item_property_id int NOT NULL, title varchar(255), content text, progress int NOT NULL default 0, lastedit_date datetime NOT NULL default '0000-00-00 00:00:00', lastedit_user_id int  NOT NULL, session_id int NOT NULL default 0);
 ALTER TABLE track_e_item_property ADD INDEX (course_id, item_property_id, session_id);