diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b96165695..09dedffde 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -579,7 +579,10 @@ module ApplicationHelper
   def principals_check_box_tags(name, principals)
     s = +''
     principals.each do |principal|
-      s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } <span class='name icon icon-#{principal.class.name.downcase}'></span>#{h principal}</label>\n"
+      s << content_tag('label',
+                       check_box_tag(name, principal.id, false, :id => nil) +
+                       (avatar(principal, :size => 16).presence || content_tag('span', nil, :class => "name icon icon-#{principal.class.name.downcase}")) +
+                       principal)
     end
     s.html_safe
   end
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 5f8b06bab..7558d12b4 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -414,6 +414,7 @@ td.center {text-align:center;}
 
 #watchers select {width: 95%; display: block;}
 #watchers img.gravatar {margin: 0 4px 2px 0;}
+#users_for_watcher img.gravatar {padding-bottom: 2px; margin-right: 4px;}
 
 span#watchers_inputs {overflow:auto; display:block;}
 span.search_for_watchers {display:block;}