diff --git a/data/database.py b/data/database.py
index c98444ec6..a00078018 100644
--- a/data/database.py
+++ b/data/database.py
@@ -278,7 +278,7 @@ class NotificationKind(BaseModel):
 class Notification(BaseModel):
   uuid = CharField(default=uuid_generator, index=True)
   kind = ForeignKeyField(NotificationKind, index=True)
-  notification_user = ForeignKeyField(User, index=True)
+  target = ForeignKeyField(User, index=True)
   metadata_json = TextField(default='{}')
   created = DateTimeField(default=datetime.now, index=True)
 
diff --git a/data/model.py b/data/model.py
index 99e3e52f7..b47706703 100644
--- a/data/model.py
+++ b/data/model.py
@@ -59,7 +59,7 @@ class InvalidBuildTriggerException(DataModelException):
   pass
 
 
-def create_user(username, password, email):
+def create_user(username, password, email, is_organization=False):
   if not validate_email(email):
     raise InvalidEmailAddressException('Invalid email address: %s' % email)
   if not validate_username(username):
@@ -96,7 +96,7 @@ def create_user(username, password, email):
 
     # If the password is None, then add a notification for the user to change
     # their password ASAP.
-    if not pw_hash:
+    if not pw_hash and not is_organization:
       create_notification('password_required', new_user)
     
     return new_user
@@ -107,7 +107,7 @@ def create_user(username, password, email):
 def create_organization(name, email, creating_user):
   try:
     # Create the org
-    new_org = create_user(name, None, email)
+    new_org = create_user(name, None, email, is_organization=True)
     new_org.organization = True
     new_org.save()
 
@@ -1546,24 +1546,44 @@ def list_trigger_builds(namespace_name, repository_name, trigger_uuid,
     .where(RepositoryBuildTrigger.uuid == trigger_uuid))
 
 
-def create_notification(kind, user, metadata={}):
+def create_notification(kind, target, metadata={}):
   kind_ref = NotificationKind.get(name=kind)
-  notification = Notification.create(kind=kind_ref, notification_user=user,
+  notification = Notification.create(kind=kind_ref, target=target,
                                      metadata_json=json.dumps(metadata))
   return notification
 
 
 def list_notifications(user, kind=None):
+  Org = User.alias()
+  AdminTeam = Team.alias()
+  AdminTeamMember = TeamMember.alias()
+  AdminUser = User.alias()
+
   query = (Notification.select()
-            .join(User)
-            .where(Notification.notification_user == user))
+           .join(User)
 
+           .switch(Notification)
+           .join(Org, JOIN_LEFT_OUTER, on=(Org.id == Notification.target))
+           .join(AdminTeam, JOIN_LEFT_OUTER, on=(Org.id ==
+                                                 AdminTeam.organization))
+           .join(TeamRole, JOIN_LEFT_OUTER, on=(AdminTeam.role == TeamRole.id))
+           .switch(AdminTeam)
+           .join(AdminTeamMember, JOIN_LEFT_OUTER, on=(AdminTeam.id ==
+                                                       AdminTeamMember.team))
+           .join(AdminUser, JOIN_LEFT_OUTER, on=(AdminTeamMember.user ==
+                                                 AdminUser.id)))
+  
+  where_clause = ((Notification.target == user) |
+                  ((AdminUser.id == user) &
+                   (TeamRole.name == 'admin')))
+  
   if kind:
-    query = query.join(NotificationKind).where(NotificationKind.name == kind)
+    where_clause = where_clause & (NotificationKind.name == kind)
 
-  return query.order_by(Notification.created).desc()
+  return query.where(where_clause).order_by(Notification.created).desc()
 
 
-def delete_notifications_by_kind(user, kind):
+def delete_notifications_by_kind(target, kind):
   kind_ref = NotificationKind.get(name=kind)
-  Notification.delete().where(Notification.notification_user == user, Notification.kind == kind_ref).execute()
+  Notification.delete().where(Notification.target == target,
+                              Notification.kind == kind_ref).execute()
diff --git a/endpoints/api.py b/endpoints/api.py
index 117ba4983..edd1a9b87 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -2521,6 +2521,7 @@ def get_logs(namespace, start_time, end_time, performer_name=None,
 
 def notification_view(notification):
   return {
+    'organization': notification.target.username if notification.target.organization else None,
     'kind': notification.kind.name,
     'created': notification.created,
     'metadata': json.loads(notification.metadata_json),
diff --git a/static/css/quay.css b/static/css/quay.css
index f706a8c5e..98d95fa90 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -18,6 +18,16 @@
   max-width: 320px;
 }
 
+.notification-view-element .orginfo {
+  margin-top: 8px;
+  float: left;
+}
+
+.notification-view-element .orginfo .orgname {
+  font-size: 12px;
+  color: #aaa;
+}
+
 .notification-view-element .circle {
   position: absolute;
   top: 14px;
@@ -30,12 +40,16 @@
 }
 
 .notification-view-element .datetime {
-  margin-top: 10px;
+  margin-top: 16px;
   font-size: 12px;
   color: #aaa;
   text-align: right;
 }
 
+.notification-view-element .message {
+  margin-bottom: 4px;
+}
+
 .notification-view-element .container {
   padding: 10px;
   border-radius: 6px;
diff --git a/static/directives/header-bar.html b/static/directives/header-bar.html
index bd534f13a..688eb8411 100644
--- a/static/directives/header-bar.html
+++ b/static/directives/header-bar.html
@@ -44,6 +44,7 @@
               ng-class="notificationService.notificationClasses"
               bs-tooltip=""
               title="{{ notificationService.notificationSummaries }}"
+              data-html="true"
               data-placement="left"
               data-container="body">
           {{ notificationService.notifications.length }}
diff --git a/static/directives/notification-view.html b/static/directives/notification-view.html
index 6d5751995..5adb81261 100644
--- a/static/directives/notification-view.html
+++ b/static/directives/notification-view.html
@@ -1,7 +1,11 @@
 <div class="notification-view-element">
   <div class="container" ng-click="showNotification();">
-    <div class="message">{{ getMessage(notification) }}</div>
-    <div class="datetime">{{ parseDate(notification.created) | date:'medium'}}</div>
     <div class="circle" ng-class="getClass(notification)"></div>
+    <div class="message">{{ getMessage(notification) }}</div>
+    <div class="orginfo" ng-if="notification.organization">
+      <img src="//www.gravatar.com/avatar/{{ getGravatar(notification.organization) }}?s=24&d=identicon" />
+      <span class="orgname">{{ notification.organization }}</span>
+    </div>
+    <div class="datetime">{{ parseDate(notification.created) | date:'medium'}}</div>
   </div>
 </div>
diff --git a/static/js/app.js b/static/js/app.js
index acf97b97d..62734d089 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -3356,11 +3356,16 @@ quayApp.directive('notificationView', function () {
       'notification': '=notification',
       'parent': '=parent'
     },
-    controller: function($scope, $element, $location, NotificationService) {
+    controller: function($scope, $element, $location, UserService, NotificationService) {
       $scope.getMessage = function(notification) {
         return NotificationService.getMessage(notification);
       };
 
+      $scope.getGravatar = function(orgname) {
+        var organization = UserService.getOrganization(orgname);
+        return organization['gravatar'] || '';
+      };
+
       $scope.parseDate = function(dateString) {
         return Date.parse(dateString);
       };
diff --git a/test/data/test.db b/test/data/test.db
index 168be98ba..e4f9f044f 100644
Binary files a/test/data/test.db and b/test/data/test.db differ