diff --git a/app/views/account/_identifier_status.rhtml b/app/views/account/_identifier_status.rhtml
index f8d9510..487dcb0 100644
--- a/app/views/account/_identifier_status.rhtml
+++ b/app/views/account/_identifier_status.rhtml
@@ -1,17 +1,18 @@
 <div class='status-identifier'>
+
+  <span class='<%= @status_class %>'><%= @status %></span>
   <% if @suggested_usernames %>
-    <% @status += '<br/>' + _('Available: ') %>
-    <% @suggested_usernames.each do |username| %>
-      <% @status += "<a href='#' class='suggested_usernames'>" + username + '</a> ' %>
-    <% end %>
+    <div class='suggested_usernames'>
+      <%= _('Available: ') %>
+      <% @suggested_usernames.each do |username| %>
+        <a href='#'><%= username %></a>
+      <% end %>
+    </div>
   <% end %>
-
-
-  <p><span class='<%= @status_class %>'><%= @status %></span></p>
   <script type="text/javascript">
     jQuery('#user_login').removeClass('<%= validation_classes %>');
     jQuery('#user_login').addClass('<%= @status_class %>');
-    jQuery('.suggested_usernames').click(function(e) {
+    jQuery('.suggested_usernames a').click(function(e) {
       e.preventDefault();
 
       fill_username(this.innerHTML);
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6e7fd7b..48185ae 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -6040,6 +6040,11 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   text-align: right;
 }
 
+#url-check .suggested_usernames,
+#url-check .suggested_usernames a {
+  color: #005000;
+}
+
 #email-check,
 #fake-check,
 #password-rate,
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index df8e30c..fa5313a 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -34,7 +34,7 @@ class AccountControllerTest < ActionController::TestCase
     assert session[:user]
     assert_response :redirect
   end
-  
+
   should 'display notice message if the login fail' do
     @controller.stubs(:logged_in?).returns(false)
     post :login, :user => {:login => 'quire', :password => 'quire'}
--
libgit2 0.21.2