diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb
index 41b4f41e7..dd543ec2c 100644
--- a/app/views/courses/_member_list.html.erb
+++ b/app/views/courses/_member_list.html.erb
@@ -56,24 +56,36 @@
                 </a>
                 <ul style="margin-left: 15px">
                   <% if @canShowCode %>
-                      <li>
-                        <%= l(:label_bidding_user_studentname) %> :
-                        <%= link_to member.user.show_name, user_path(member.user) %>
-                      </li>
-                      </br>
+                      <% if member.user.show_name == '' && member.user.user_extensions.student_id == '' %>
+                          <li>
+                            <%= l(:label_username)%>
+                            <%= link_to(member.user.name, user_path(member.user)) %>
+                          </li>
+                      <% else %>
+                          <% unless member.user.show_name == ''%>
+                              <li>
+                                <%= l(:label_bidding_user_studentname) %> :
+                                <%= link_to member.user.show_name, user_path(member.user) %>
+                              </li>
+                              </br>
+                          <% end %>
+                          <% unless member.user.user_extensions.student_id == '' %>
+                              <li>
+                                <%= l(:label_bidding_user_studentcode) %> :
+                                <%= link_to member.user.user_extensions.student_id, user_path(member.user) %>
+                              </li>
+                          <% end %>
+                      <% end %>
                       <%#= content_tag "li", "#{l(:label_bidding_user_studentname)}#{' : '}"link_to(member.user.show_name, user_path(member.user)) %>
                   <% else %>
-                      <%= content_tag "li", link_to(member.user.name, user_path(member.user)) %>
-                  <% end %>
+                      <li>
+                        <%= l(:label_username)%>
+                        <%= link_to(member.user.name, user_path(member.user)) %>
+                      </li>
+                <% end %>
                   <!--teacher's code disapeared  moified by huang-->
 
-                  <% if @canShowCode  %>
-                      <li>
-                        <%= l(:label_bidding_user_studentcode) %> :
-                        <%= link_to member.user.user_extensions.student_id, user_path(member.user) %>
-                      </li>
-                      <%#= content_tag "li", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :style=> "color:#1c9ec7;" %>
-                  <% end %>
+
                 </ul>
                 <% if @subPage_title == l(:label_student_list) %>
                     <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
diff --git a/app/views/courses/_member_list_detail.html.erb b/app/views/courses/_member_list_detail.html.erb
index f37067cb5..bc6cbd242 100644
--- a/app/views/courses/_member_list_detail.html.erb
+++ b/app/views/courses/_member_list_detail.html.erb
@@ -7,24 +7,36 @@
       <a href="#" class="st_img" style="float:left;"> <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 40, :height => 40))  %></a>
       <ul style="margin-left: 15px">
         <% if @canShowCode %>
-            <li>
-              <%= l(:label_bidding_user_studentname) %> :
-              <%= link_to member.user.show_name, user_path(member.user) %>
-
-            </li> </br>
+            <% if member.user.show_name == '' && member.user.user_extensions.student_id == '' %>
+                <li>
+                  <%= l(:label_username)%>
+                  <%= link_to(member.user.name, user_path(member.user)) %>
+                </li>
+            <% else %>
+                <% unless member.user.show_name == ''%>
+                    <li>
+                      <%= l(:label_bidding_user_studentname) %> :
+                      <%= link_to member.user.show_name, user_path(member.user) %>
+                    </li>
+                    </br>
+                <% end %>
+                <% unless member.user.user_extensions.student_id == '' %>
+                    <li>
+                      <%= l(:label_bidding_user_studentcode) %> :
+                      <%= link_to member.user.user_extensions.student_id, user_path(member.user) %>
+                    </li>
+                <% end %>
+            <% end %>
             <%#= content_tag "li", "#{l(:label_bidding_user_studentname)}#{' : '}"link_to(member.user.show_name, user_path(member.user)) %>
         <% else %>
-            <%= content_tag "li", link_to(member.user.name, user_path(member.user)) %>
+            <li>
+              <%= l(:label_username)%>
+              <%= link_to(member.user.name, user_path(member.user)) %>
+            </li>
         <% end %>
         <!--teacher's code disapeared  moified by huang-->
 
-        <% if @canShowCode  %>
-            <li>
-              <%= l(:label_bidding_user_studentcode) %> :
-              <%= link_to member.user.user_extensions.student_id, user_path(member.user) %>
-            </li>
-            <%#= content_tag "li", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :style=> "color:#1c9ec7;" %>
-        <% end %>
+
       </ul>
       <% if @subPage_title == l(:label_student_list) %>
           <%= link_to format("%0.2f",member.score.to_s), {