diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 6887489a77..57e9a37883 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -115,7 +115,7 @@ export default class Login extends React.Component {
         }
 
         let teamSignUp = null;
-        if (global.window.mm_config.EnableTeamCreation === 'true') {
+        if (global.window.mm_config.EnableTeamCreation === 'true' && !Utils.isMobileApp()) {
             teamSignUp = (
                 <div className='margin--extra'>
                     <a
diff --git a/web/templates/claim_account.html b/web/templates/claim_account.html
index 6c9f36fa74..bcf63fd953 100644
--- a/web/templates/claim_account.html
+++ b/web/templates/claim_account.html
@@ -5,8 +5,22 @@
 <body class="white">
 	<div class="container-fluid">
 		<div class="inner__wrap">
-			<div class="row content" id="claim"></div>
-		</div>
+			<div class="row content">
+				<div class="signup-header">
+					<a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+				</div>
+				<div class="col-sm-12">
+					<div class="signup-team__container">
+						<img class="signup-team-logo" src="/static/images/logo.png" />
+						<div id="claim"></div>
+					</div>
+				</div>
+				<div class="footer-push"></div>
+			</div>
+			<div class="row footer">
+				{{template "footer" . }}
+			</div>
+		<div>
 	</div>
 	<script>
 		window.setup_claim_account_page({{ .Props }});
diff --git a/web/templates/docs.html b/web/templates/docs.html
index 0e0f516488..1a20580fb7 100644
--- a/web/templates/docs.html
+++ b/web/templates/docs.html
@@ -6,6 +6,9 @@
 <div class="container-fluid">
     <div class="inner__wrap">
         <div class="row content">
+            <div class="signup-header">
+                    <a href="/">{{ .ClientCfg.SiteName }}</a>
+                </div>
             <div class="col-sm-12">
                 <div class="docs__page" id="docs"></div>
             </div>
diff --git a/web/templates/find_team.html b/web/templates/find_team.html
index 9acf3ac64b..d32ea0dc8c 100644
--- a/web/templates/find_team.html
+++ b/web/templates/find_team.html
@@ -6,6 +6,9 @@
 	<div class="container-fluid">
 		<div class="inner__wrap">
 			<div class="row content">
+				<div class="signup-header">
+					<a href="/">{{ .ClientCfg.SiteName }}</a>
+				</div>
 				<div class="col-sm-12">
 					<div class="signup-team__container">
 						<img class="signup-team-logo" src="/static/images/logo.png" />
diff --git a/web/templates/login.html b/web/templates/login.html
index f6a5512207..be5e6bf4f5 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">
-					{{.Props.TeamDisplayName}}
+					<a href="/">{{ .ClientCfg.SiteName }}</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 7f6335c923..df82285ef4 100644
--- a/web/templates/password_reset.html
+++ b/web/templates/password_reset.html
@@ -5,7 +5,21 @@
 <body class="white">
 	<div class="container-fluid">
 		<div class="inner__wrap">
-			<div class="row content" id="reset"></div>
+			<div class="row content">
+				<div class="signup-header">
+					<a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+				</div>
+				<div class="col-sm-12">
+					<div class="signup-team__container">
+						<img class="signup-team-logo" src="/static/images/logo.png" />
+						<div id="reset"></div>
+					</div>
+				</div>
+				<div class="footer-push"></div>
+			</div>
+			<div class="row footer">
+				{{template "footer" . }}
+			</div>
 		</div>
 	</div>
 	<script>
diff --git a/web/templates/verify.html b/web/templates/verify.html
index a49ba79304..bab329c7dd 100644
--- a/web/templates/verify.html
+++ b/web/templates/verify.html
@@ -6,7 +6,16 @@
         <div class="container-fluid">
             <div class="inner__wrap">
                 <div class="row content">
-                    <div id="verify"></div>
+                    <div class="signup-header">
+                        <a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+                    </div>
+                    <div class="col-sm-12">
+                        <div class="signup-team__container">
+                            <img class="signup-team-logo" src="/static/images/logo.png" />
+                            <div id="verify"></div>
+                        </div>
+                    </div>
+                    <div class="footer-push"></div>
                 </div>
                 <div class="row footer">
                     {{template "footer" . }}
diff --git a/web/templates/welcome.html b/web/templates/welcome.html
deleted file mode 100644
index 15c072226b..0000000000
--- a/web/templates/welcome.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{{define "welcome"}}
-<!DOCTYPE html>
-<html>
-{{template "head" . }}
-<body>
-  <div class="container-fluid">
-    <div class="inner__wrap">
-        <div class="row header">
-          <div id="navbar"></div>
-        </div>
-        <div class="row main">
-          <div class="app__content">
-            <div class="welcome-info">
-              <h1>Welcome to {{ .ClientCfg.SiteName }}!</h1>
-              <p>
-                  You do not appear to be part of any teams. Please contact your
-                  administrator to have him send you an invitation to a private team.
-                  Or you can start a new private team.
-              </p>
-              <div class="alert alert-warning">
-                  If you where invited to a team that you do not see you must
-                  confirm your email address first before gaining access to the
-                  team.
-              </div>
-              <div id="new_channel">
-              </div>
-            </div>
-          </div>
-        </div>
-    </div>
-  </div>
-  <script>
-  window.setup_welcome_page();
-  </script>
-</body>
-</html>
-{{end}}
