diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index d8eddbed4..bc0ecbaee 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -52,18 +52,20 @@
 											<div class="info_font" style=" word-wrap: break-word; word-break: break-all">
 												<%= @project.name %>
 											</div> 
-											<% unless @course.teacher.id == User.current.id%>
-												<!-- <%= image_tag "/images/sidebar/add.png" %>
-												<%= image_tag "/images/add.png" %> -->
-												<div class="icon-add icon" style="margin-right: 30px; margin-left: 20px">
-											<%= join_in_course(@project, User.current)%></div>
-											<% end %> 
-											<% unless User.current.member_of?(@project) %>
-											<!-- <%= image_tag "/images/fav.png" %> -->
-											<div style="padding-right: 10px">
-												<span class="icon-fav icon"></span><span>
-											<%= watcher_link(@project, User.current) %></span></div>
-											<% end %></td>
+											<%if User.current.login?%>
+												<% unless @course.teacher.id == User.current.id%>
+													<!-- <%= image_tag "/images/sidebar/add.png" %>
+													<%= image_tag "/images/add.png" %> -->
+													<div class="icon-add icon" style="margin-right: 30px; margin-left: 20px">
+												<%= join_in_course(@project, User.current)%></div>
+												<% end %> 
+												<% unless User.current.member_of?(@project) %>
+												<!-- <%= image_tag "/images/fav.png" %> -->
+												<div style="padding-right: 10px">
+													<span class="icon-fav icon"></span><span>
+												<%= watcher_link(@project, User.current) %></span></div>
+												<% end %></td>
+											<% end %>
 											
 										</tr>
 									</table>