diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index f4c624968..fe42d00e8 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<%= current_language %>">
 <head>
 <meta charset="utf-8" />
 <title><%=h html_title %></title>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 9595b322e..d71555e8d 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -55,7 +55,7 @@
 												<td>
 												<table>
 													<tr>
-														<td class="info_font" align="center" style=" word-wrap: break-word; word-break: break-all"><%= h @user.lastname<<@user.firstname %> <!-- added by bai -->
+														<td class="info_font" align="center" style=" word-wrap: break-word; word-break: break-all"><%= h (@user.lastname+@user.firstname) %> <!-- added by bai -->
 														<%= image_tag(gender_avatar_uri(@user), weight:"25px", height:"25px") if (@user.user_extensions && (@user.user_extensions.identity != 2) )%></td>	
 													</tr>
 													<tr>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 742c28a25..74d7a4a2a 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -41,7 +41,7 @@
 					<div>
 					<table width="200" border="0">
 					  <tr>
-					    <td colspan="2" align="center" class="font_welcome_Cdescription" ><%= l(:label_welcome) %> <strong class="font_small_watch" style=" word-wrap: break-word; word-break: break-all"><%=link_to User.current.lastname<<User.current.firstname, user_path(User.current) %></strong> <%= l(:label_join) %></td>
+					    <td colspan="2" align="center" class="font_welcome_Cdescription" ><%= l(:label_welcome) %> <strong class="font_small_watch" style=" word-wrap: break-word; word-break: break-all"><%=link_to (User.current.lastname+User.current.firstname), user_path(User.current) %></strong> <%= l(:label_join) %></td>
 					  </tr>
 					  <tr>
   						<td rowspan="2" style="padding-left: 20px"><%= image_tag(url_to_avatar(User.current), :class => 'avatar') %></td>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3a1113bc7..fa07505ef 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1535,6 +1535,7 @@ en:
   label_teacher_work_unit: Position
   label_course_overview: Status
   label_course_file: File
+  label_stores_index: Resource search
   label_course_news: News
   
   label_x_base_courses_member: 

<%= l(:label_welcome) %> <%=link_to User.current.lastname< <%= l(:label_join) %>		<%= l(:label_welcome) %> <%=link_to (User.current.lastname+User.current.firstname), user_path(User.current) %> <%= l(:label_join) %>
<%= image_tag(url_to_avatar(User.current), :class => 'avatar') %>