diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index 75c39a407..9eaf7f6ed 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -11,8 +11,10 @@
 	<ul style="padding:0 0; margin:0 0;display:inline;">
 		<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;" class="loggedas_li">
 			<%=link_to_user(User.current)%>
+            <% hidden_non_project = Setting.find_by_name("hidden_non_project")
+                visiable = hidden_non_project && hidden_non_project.value == "0"%>
 			<ul class="sub_menu">
-              <% if @show_course == 1 %>
+              <% if @show_course == 1 && !visiable %>
 				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
                     <% hasCourse=false %>
                     <% User.current.courses.each do |course| %>
diff --git a/app/views/welcome/_link_to_another.html.erb b/app/views/welcome/_link_to_another.html.erb
index e9a19be4e..6540409d1 100644
--- a/app/views/welcome/_link_to_another.html.erb
+++ b/app/views/welcome/_link_to_another.html.erb
@@ -1,6 +1,9 @@
-
+<%hidden_non_project = Setting.find_by_name("hidden_non_project")
+  visiable = hidden_non_project && hidden_non_project.value == "0"%>
+<% unless visiable%>
 <div class="linkother" style="margin-left: 30%; float: left">
   <a href="http://<%= Setting.host_name%>" class="link_other_item"><%=l(:label_projects_management_platform)%></a>
   <a href="http://<%= Setting.host_course%>" class="link_other_item"><%=l(:label_courses_management_platform)%></a>
   <a href="http://<%= Setting.host_contest%>" class="link_other_item"><%=l(:label_contests_management_platform)%></a>
-</div>
\ No newline at end of file
+</div>
+<% end%>
\ No newline at end of file