diff --git a/.mailmap b/.mailmap
index 595bcba03..f4f433092 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,3 +6,4 @@
 <launchpad@markgius.com> <mgius7096@gmail.com>
 <yorik.sar@gmail.com> <yorik@ytaraday>
 <jeblair@hp.com> <james.blair@rackspace.com>
+<ke.wu@ibeca.me> <ke.wu@nebula.com>
diff --git a/AUTHORS b/AUTHORS
index fbdf4baa3..678d92415 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,6 +32,7 @@ John Postlethwait <john.postlethwait@nebula.com>
 Joseph Heck <heckj@mac.com>
 Joshua McKenty <joshua@pistoncloud.com>
 Julien Danjou <julien.danjou@enovance.com>
+Ke Wu <ke.wu@ibeca.me>
 Ken Pepple <ken.pepple@gmail.com>
 Mark Gius <launchpad@markgius.com>
 Michael Szilagyi <mszilagyi@gmail.com>
diff --git a/horizon/templates/horizon/common/_sidebar.html b/horizon/templates/horizon/common/_sidebar.html
index 20bda9c3a..bfc1fb585 100644
--- a/horizon/templates/horizon/common/_sidebar.html
+++ b/horizon/templates/horizon/common/_sidebar.html
@@ -1,7 +1,7 @@
-{% load horizon i18n %}
+{% load branding horizon i18n %}
 
 <div class='sidebar'>
-  <h1 class="brand clearfix"><a href="{% url horizon:user_home %}">{% trans "OpenStack Dashboard" %}</a></h1>
+  <h1 class="brand clearfix"><a href="{% url horizon:user_home %}">{% site_branding %}</a></h1>
 
   {% horizon_main_nav %}
 
diff --git a/horizon/tests/templatetag_tests.py b/horizon/tests/templatetag_tests.py
index 10548916c..ced9f8ca8 100644
--- a/horizon/tests/templatetag_tests.py
+++ b/horizon/tests/templatetag_tests.py
@@ -23,6 +23,9 @@ import re
 from django.utils.text import normalize_newlines
 
 from horizon import test
+from horizon.templatetags import branding
+from django.template import Context, Template
+from django.conf import settings
 
 
 def single_line(text):
@@ -33,4 +36,15 @@ def single_line(text):
 
 
 class TemplateTagTests(test.TestCase):
-    pass
+    '''Test Custom Template Tag'''
+    def render_template_tag(self, tag_name, tag_require=''):
+        '''Render a Custom Template Tag to string'''
+        template = Template("{%% load %s %%}{%% %s %%}"
+                            % (tag_require, tag_name))
+        return template.render(Context())
+
+    def test_site_branding_tag(self):
+        '''Test if site_branding tag renders the correct setting'''
+        rendered_str = self.render_template_tag("site_branding", "branding")
+        self.assertEqual(settings.SITE_BRANDING, rendered_str.strip(),
+                        "tag site_branding renders %s" % rendered_str.strip())