diff --git a/dashboard/templates/overview.html b/dashboard/templates/overview.html
index 0d10e1d29..6687530b7 100644
--- a/dashboard/templates/overview.html
+++ b/dashboard/templates/overview.html
@@ -164,7 +164,10 @@
         <div style="float: left;"><img src="${gravatar}"></div>
         <div style="margin-left: 90px;">
             <h2>${user_name}</h2>
-            <div>Company: {%html company_link %}</div>
+            <div>Company: {%html company_link %}
+                    [<span style="font-style: italic;"><a
+                        href="https://wiki.openstack.org/wiki/Stackalytics#Company_affiliation" style="color: grey" target="_blank">how to change↗</a></span>]
+            </div>
             {%if launchpad_id != '' %}
                 <div>Launchpad: <a href="https://launchpad.net/~${launchpad_id}">${launchpad_id}</a></div>
             {%/if%}
diff --git a/dashboard/web.py b/dashboard/web.py
index 97397ebf4..2805f6a03 100644
--- a/dashboard/web.py
+++ b/dashboard/web.py
@@ -815,8 +815,13 @@ def get_bpd(records):
     result = []
     for record in records:
         if record['record_type'] in ['bpd', 'bpc']:
+            mention_date = record.get('mention_date')
+            if mention_date:
+                date = format_date(mention_date)
+            else:
+                date = 'never'
             result.append({
-                'date': format_date(record['mention_date']),
+                'date': date,
                 'status': record['lifecycle_status'],
                 'metric': record.get('mention_count') or 0,
                 'id': record['name'],