diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 66a011ac9a..4ad5eaa714 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -5,9 +5,6 @@
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.i18n.Tr "settings.manage_access_token"}}
-			<div class="ui right">
-				<div class="ui blue tiny show-panel button" data-panel="#add-access-token-panel">{{.i18n.Tr "settings.generate_new_token"}}</div>
-			</div>
 		</h4>
 		<div class="ui attached segment">
 			<div class="ui key list">
@@ -32,24 +29,21 @@
 				{{end}}
 			</div>
 		</div>
-		<br>
-		<div {{if not .HasError}}class="hide"{{end}} id="add-access-token-panel">
-			<h4 class="ui top attached header">
-				{{.i18n.Tr "settings.generate_new_token"}}
-			</h4>
-			<div class="ui attached segment">
-				<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
-					{{.CsrfTokenHtml}}
-					<p>{{.i18n.Tr "settings.new_token_desc"}}</p>
-					<div class="field {{if .Err_Name}}error{{end}}">
-						<label for="name">{{.i18n.Tr "settings.token_name"}}</label>
-						<input id="name" name="name" value="{{.name}}" autofocus required>
-					</div>
-					<button class="ui green button">
-						{{.i18n.Tr "settings.generate_token"}}
-					</button>
-				</form>
-			</div>
+		<h4 class="ui top attached header">
+			{{.i18n.Tr "settings.generate_new_token"}}
+		</h4>
+		<div class="ui attached segment">
+			<p>{{.i18n.Tr "settings.new_token_desc"}}</p>
+			<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
+				{{.CsrfTokenHtml}}
+				<div class="field {{if .Err_Name}}error{{end}}">
+					<label for="name">{{.i18n.Tr "settings.token_name"}}</label>
+					<input id="name" name="name" value="{{.name}}" autofocus required>
+				</div>
+				<button class="ui green button">
+					{{.i18n.Tr "settings.generate_token"}}
+				</button>
+			</form>
 		</div>
 	</div>
 </div>