diff --git a/auth/scopes.py b/auth/scopes.py
index c71e5faa7..b92f9278e 100644
--- a/auth/scopes.py
+++ b/auth/scopes.py
@@ -76,7 +76,7 @@ IMPLIED_SCOPES = {
 
 def scopes_from_scope_string(scopes):
   if not scopes:
-    return {}
+    scopes = ''
     
   return {ALL_SCOPES.get(scope, None) for scope in scopes.split(',')}
 
diff --git a/avatars/avatars.py b/avatars/avatars.py
index 386b5fc57..40935df10 100644
--- a/avatars/avatars.py
+++ b/avatars/avatars.py
@@ -35,6 +35,7 @@ class BaseAvatar(object):
 class GravatarAvatar(BaseAvatar):
   """ Avatar system that uses gravatar for generating avatars. """
   def compute_hash(self, email, name=None):
+    email = email or ""
     return hashlib.md5(email.strip().lower()).hexdigest()
 
   def get_url(self, email, size=16, name=None):
@@ -45,6 +46,7 @@ class GravatarAvatar(BaseAvatar):
 class LocalAvatar(BaseAvatar):
   """ Avatar system that uses the local system for generating avatars. """
   def compute_hash(self, email, name=None):
+    email = email or ""
     if not name and not email:
       return ''
 
diff --git a/endpoints/web.py b/endpoints/web.py
index 4a1205108..e297074ff 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -184,7 +184,7 @@ def status():
 
 
 @app.route("/avatar/<avatar_hash>")
-def avatar(avatar_hash):
+def render_avatar(avatar_hash):
   try:
     size = int(request.args.get('size', 16))
   except ValueError:
@@ -424,10 +424,11 @@ def request_authorization_code():
       'name': oauth_app.name,
       'description': oauth_app.description,
       'url': oauth_app.application_uri,
+      'avatar': avatar.compute_hash(oauth_app.avatar_email, name=oauth_app.name),
       'organization': {
         'name': oauth_app.organization.username,
         'avatar': avatar.compute_hash(oauth_app.organization.email,
-                                      name=oauth_app.organization.name)
+                                      name=oauth_app.organization.username)
       }
     }
 
diff --git a/static/css/quay.css b/static/css/quay.css
index 9213bb575..9d7568f97 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -4256,9 +4256,10 @@ pre.command:before {
   display: block !important;
 }
 
-.auth-header > img {
+.auth-header > .avatar {
   float: left;
-  margin-top: 8px;
+  display: inline-block;
+  margin-top: 12px;
   margin-right: 20px;
 }
 
diff --git a/static/partials/manage-application.html b/static/partials/manage-application.html
index 266a61e6e..c9e084b39 100644
--- a/static/partials/manage-application.html
+++ b/static/partials/manage-application.html
@@ -7,8 +7,8 @@
     <div class="row">
       <div class="col-md-12">
         <div class="auth-header">          
-          <h2><span class="avatar" size="48" email="application.avatar_email" name="application.name"></span>
-              {{ application.name || '(Untitled)' }}</h2>
+          <span class="avatar" size="48" email="application.avatar_email" name="application.name"></span>
+          <h2>{{ application.name || '(Untitled)' }}</h2>
           <h4>
             <span class="avatar" size="24" hash="organization.avatar" style="vertical-align: middle; margin-right: 4px;"></span>
             <span style="vertical-align: middle"><a href="/organization/{{ organization.name }}/admin">{{ organization.name }}</a></span>
@@ -99,7 +99,8 @@
             </div>
 
             <div style="margin-bottom: 20px">
-              <strong>Note:</strong> The generated token will act on behalf of user <img src="//www.gravatar.com/avatar/{{ user.gravatar }}?s=16&d=identicon" style="margin-left: 6px; margin-right: 4px;">
+              <strong>Note:</strong> The generated token will act on behalf of user
+              <span class="avatar" hash="user.avatar" size="16" style="margin-left: 6px; margin-right: 4px;"></span>
               {{ user.username }}
             </div>
 
diff --git a/templates/oauthorize.html b/templates/oauthorize.html
index 19bde633b..567547f6f 100644
--- a/templates/oauthorize.html
+++ b/templates/oauthorize.html
@@ -13,10 +13,10 @@
 
   <div class="container auth-container" ng-if="!user.anonymous">
     <div class="auth-header">
-      <span class="avatar" size="48" hash="{{ application.avatar }}"></span>
+      <span class="avatar" size="48" hash="'{{ application.avatar }}'"></span>
       <h2><a href="{{ application.url }}" target="_blank">{{ application.name }}</a></h2>
       <h4>
-        <span class="avatar" size="24" hash="{{ application.organization.avatar }}"
+        <span class="avatar" size="24" hash="'{{ application.organization.avatar }}'"
               style="vertical-align: middle; margin-right: 4px;"></span>
         <span style="vertical-align: middle">{{ application.organization.name }}</span>
       </h4>