diff --git a/config.json b/config.json
index 2541eab..b7eee38 100644
--- a/config.json
+++ b/config.json
@@ -1,4 +1,5 @@
 {
     "APPNAME": "",
+    "APPBRAND": "",
     "DBNAME": "smash.db"
-}
\ No newline at end of file
+}
diff --git a/smash/__init__.py b/smash/__init__.py
index 4e7d058..30cf65f 100644
--- a/smash/__init__.py
+++ b/smash/__init__.py
@@ -11,6 +11,18 @@ conf = config.Config('config.json')
 if 'HEROKU' in os.environ:
     conf.add(('HEROKU', 1))
 
+# Load app name from environment if it's not in the config
+if ('APPNAME' in conf.config and
+    conf.config['APPNAME']=="" and
+    'APPNAME' in os.environ):
+    conf.add(('APPNAME', os.environ['APPNAME']))
+
+# Load app brand name from environment if it's not in the config
+if ('APPBRAND' in conf.config and
+    conf.config['APPBRAND']=="" and
+    'APPBRAND' in os.environ):
+    conf.add(('APPBRAND', os.environ['APPBRAND']))
+
 db = database.Database(conf.config["DBNAME"])
 models.init_models(db)
 
diff --git a/smash/templates/base.html b/smash/templates/base.html
index cd00633..3de0eeb 100644
--- a/smash/templates/base.html
+++ b/smash/templates/base.html
@@ -18,7 +18,7 @@
     <div class="container">
       <nav class="navbar navbar-default navbar-upper">
         <div class="navbar-header">
-          <a class="navbar-brand navbar-brand-upper" href="">smash</a>
+          <a class="navbar-brand navbar-brand-upper" href="">{{ appbrand }}</a>
         </div>
       </nav>
       <nav class="navbar navbar-static-top navbar-lower">
diff --git a/smash/views.py b/smash/views.py
index feab33d..978a38e 100644
--- a/smash/views.py
+++ b/smash/views.py
@@ -7,7 +7,8 @@ from smash import app, conf, db
 def index():
     return render_template(
         "index.html",
-        appname=conf.config["APPNAME"],
+        appname=conf.config['APPNAME'],
+        appbrand=conf.config['APPBRAND'],
         title="Quotes",
         msg="Landing page!"
     )
@@ -20,7 +21,8 @@ def latest():
 
     return render_template(
         "latest.html",
-        appname=conf.config["APPNAME"],
+        appname=conf.config['APPNAME'],
+        appbrand=conf.config['APPBRAND'],
         title="Latest",
         quotes=quotes
     )
@@ -41,7 +43,8 @@ def quote(id):
         ]
         return render_template(
         "latest.html",
-        appname=conf.config["APPNAME"],
+        appname=conf.config['APPNAME'],
+        appbrand=conf.config['APPBRAND'],
         title="Latest",
         quotes=quote
     )
@@ -51,6 +54,7 @@ def quote(id):
 def tags():
     return render_template(
         "tags.html",
-        appname=conf.config["APPNAME"],
+        appname=conf.config['APPNAME'],
+        appbrand=conf.config['APPBRAND'],
         title="Tags"
     )