diff --git a/api/templates/error.html b/api/templates/error.html
index 2b6211be26..2f588aead5 100644
--- a/api/templates/error.html
+++ b/api/templates/error.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>{{ .ClientCfg.SiteName }} - Error</title>
+    <title><span class='fa fa-chevron-left'></span>Back - Error</title>
 
     <link rel="stylesheet" href="/static/css/bootstrap-3.3.5.min.css">
     <link rel="stylesheet" href="/static/css/jasny-bootstrap.min.css" rel="stylesheet">
diff --git a/i18n/en.json b/i18n/en.json
index f45f655260..b904cd8227 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3355,6 +3355,10 @@
     "id": "web.find_team.title",
     "translation": "Find Team"
   },
+  {
+    "id": "web.header.back",
+    "translation": "Back"
+  },
   {
     "id": "web.footer.about",
     "translation": "About"
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index 81fe037f73..e9c872a6ec 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -5,6 +5,11 @@
     line-height: 33px;
     padding: 0 1em 0.2em;
     background: #EEE;
+
+    .fa {
+        margin-right: 5px;
+    }
+
 }
 .signup-team__container {
     padding: 100px 0px 50px 0px;
diff --git a/web/templates/claim_account.html b/web/templates/claim_account.html
index bcf63fd953..2a9126d1be 100644
--- a/web/templates/claim_account.html
+++ b/web/templates/claim_account.html
@@ -7,7 +7,7 @@
 		<div class="inner__wrap">
 			<div class="row content">
 				<div class="signup-header">
-					<a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+					<a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
 				</div>
 				<div class="col-sm-12">
 					<div class="signup-team__container">
diff --git a/web/templates/docs.html b/web/templates/docs.html
index 1a20580fb7..dc18e5cb69 100644
--- a/web/templates/docs.html
+++ b/web/templates/docs.html
@@ -7,7 +7,7 @@
     <div class="inner__wrap">
         <div class="row content">
             <div class="signup-header">
-                    <a href="/">{{ .ClientCfg.SiteName }}</a>
+                    <a href="/"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
                 </div>
             <div class="col-sm-12">
                 <div class="docs__page" id="docs"></div>
diff --git a/web/templates/find_team.html b/web/templates/find_team.html
index 15b8bf4635..b7e1d7eca0 100644
--- a/web/templates/find_team.html
+++ b/web/templates/find_team.html
@@ -7,7 +7,7 @@
 		<div class="inner__wrap">
 			<div class="row content">
 				<div class="signup-header">
-					<a href="/">{{ .ClientCfg.SiteName }}</a>
+					<a href="/"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
 				</div>
 				<div class="col-sm-12">
 					<div class="signup-team__container">
diff --git a/web/templates/login.html b/web/templates/login.html
index be5e6bf4f5..88540a9068 100644
--- a/web/templates/login.html
+++ b/web/templates/login.html
@@ -7,7 +7,7 @@
 		<div class="inner__wrap">
 			<div class="row content">
 				<div class="signup-header">
-					<a href="/">{{ .ClientCfg.SiteName }}</a>
+					<a href="/"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
 				</div>
 				<div class="col-sm-12">
 						<div id="login"></div>
diff --git a/web/templates/password_reset.html b/web/templates/password_reset.html
index df82285ef4..e68f8b693a 100644
--- a/web/templates/password_reset.html
+++ b/web/templates/password_reset.html
@@ -7,7 +7,7 @@
 		<div class="inner__wrap">
 			<div class="row content">
 				<div class="signup-header">
-					<a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+					<a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
 				</div>
 				<div class="col-sm-12">
 					<div class="signup-team__container">
diff --git a/web/templates/signup_team_complete.html b/web/templates/signup_team_complete.html
index 4b179b1e1d..3873d8978d 100644
--- a/web/templates/signup_team_complete.html
+++ b/web/templates/signup_team_complete.html
@@ -6,6 +6,9 @@
     <div class="container-fluid">
         <div class="inner__wrap">
             <div class="row content">
+                <div class="signup-header">
+                    <a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
+                </div>
                 <div class="col-sm-12">
                     <div class="signup-team__container">
                         <div id="signup-team-complete"></div>
diff --git a/web/templates/signup_team_confirm.html b/web/templates/signup_team_confirm.html
index d16861808c..31f1ba95bb 100644
--- a/web/templates/signup_team_confirm.html
+++ b/web/templates/signup_team_confirm.html
@@ -6,6 +6,9 @@
     <div class="container-fluid">
         <div class="inner__wrap">
             <div class="row content">
+                <div class="signup-header">
+                    <a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
+                </div>
                 <div class="col-sm-12">
                     <div id="signup-team-confirm"></div>
                 </div>
diff --git a/web/templates/signup_user_complete.html b/web/templates/signup_user_complete.html
index 2400b7b77f..937a89dd2c 100644
--- a/web/templates/signup_user_complete.html
+++ b/web/templates/signup_user_complete.html
@@ -6,6 +6,9 @@
     <div class="container-fluid">
         <div class="inner__wrap">
             <div class="row content">
+                <div class="signup-header">
+                    <a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
+                </div>
                 <div class="col-sm-12">
                     <div class="signup-team__container padding--less">
                         <div id="signup-user-complete"></div>
diff --git a/web/templates/verify.html b/web/templates/verify.html
index bab329c7dd..2e5496d7a8 100644
--- a/web/templates/verify.html
+++ b/web/templates/verify.html
@@ -7,7 +7,7 @@
             <div class="inner__wrap">
                 <div class="row content">
                     <div class="signup-header">
-                        <a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+                        <a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
                     </div>
                     <div class="col-sm-12">
                         <div class="signup-team__container">
diff --git a/web/web.go b/web/web.go
index efe0e6b131..09450b9767 100644
--- a/web/web.go
+++ b/web/web.go
@@ -54,6 +54,7 @@ func (me *HtmlTemplatePage) Render(c *api.Context, w http.ResponseWriter) {
 	me.Props["Locale"] = me.Locale
 	me.SessionTokenIndex = c.SessionTokenIndex
 
+	me.ClientCfg["HeaderBack"] = c.T("web.header.back")
 	me.ClientCfg["FooterHelp"] = c.T("web.footer.help")
 	me.ClientCfg["FooterTerms"] = c.T("web.footer.terms")
 	me.ClientCfg["FooterPrivacy"] = c.T("web.footer.privacy")
