diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 03710844b..5fca9caf6 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -98,7 +98,17 @@
 	</div> 
 	<div class="main-content-bar">
 	<div class="welcome_left" >
-			<span class="font_welcome_trustie"><%= School.find(params[:school_id]).name %><br />
+			<span class="font_welcome_trustie">
+				<% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
+				<% else %>
+					<% if params[:school_id].nil? %>
+						<%= School.find(User.current.user_extensions.school.id).name %>
+						<br />
+					<% else %>
+						<%= School.find(params[:school_id]).name %>
+						<br />
+					<% end %>
+				<% end %>
 				<%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_course) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
 	</div>
 	<div class="search-bar">