diff --git a/cmd/drone-server/static/scripts/views/users/content.html b/cmd/drone-server/static/scripts/views/users/content.html
index d253e678..89d8b941 100644
--- a/cmd/drone-server/static/scripts/views/users/content.html
+++ b/cmd/drone-server/static/scripts/views/users/content.html
@@ -7,7 +7,7 @@
 
     <div class="blankslate" ng-show="users.length === 1 && !search_text && !waiting">
       <i class="material-icons">control_point_duplicate</i>
-      <span>Get started by adding a user.<br/>Just type the user login (ie octocat) in the text box above.</span>
+      <span>Get started by adding your team members.<br/>Just type the user login (ie octocat) in the text box above.</span>
     </div>
 
     <div class="alert alert-create-not-found" ng-show="!!search_text">
@@ -26,7 +26,7 @@
     </div>
 
     <ul class="list cozy user-list">
-      <li class="row row-user" ng-repeat="user in users | filter: search_text">
+      <li class="row row-user" ng-repeat="user in users | orderBy:'login' | filter: search_text">
         <div class="column-avatar">
           <img ng-src="{{ user.gravatar_id | gravatar }}" />
         </div>
diff --git a/cmd/drone-server/static/styles/label.css b/cmd/drone-server/static/styles/label.css
index 190880e5..0c16d5df 100644
--- a/cmd/drone-server/static/styles/label.css
+++ b/cmd/drone-server/static/styles/label.css
@@ -7,11 +7,19 @@
   vertical-align: middle;
   border-radius: 2px;
   margin-left: 15px;
+  cursor:default;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+          user-select: none;
 }
 
 .label-success {
-  background: #a3be8c;
+  color: #a3be8c;
+  border: 1px solid #a3be8c;
+  background: #fff;
 }
 .label-failure {
-  background: #bf616a;
+  color: #bf616a;
+  border: 1px solid #bf616a;
+  background: #fff;
 }
\ No newline at end of file