diff --git a/templates/user/auth/link_account.tmpl b/templates/user/auth/link_account.tmpl
new file mode 100644
index 0000000..f44d75e
--- /dev/null
+++ b/templates/user/auth/link_account.tmpl
@@ -0,0 +1,53 @@
+{{template "base/head" .}}
+<div role="main" aria-label="{{.Title}}" class="page-content user link-account">
+	<div class="ui middle very relaxed page grid">
+		<div class="column">
+			<div class="ui positive message flash-info">
+				<p>
+					Username and email already provided by Blender ID.<br/>
+					<strong>Press "Complete Registration" to continue.</strong>
+				</p>
+			</div>
+			<div class="ui tab {{if not .user_exists}}active{{end}}"
+				data-tab="auth-link-signup-tab">
+
+				{{/* template "user/auth/signup_inner" . */}}
+
+				<div class="ui container column fluid icon">
+					<h4 class="ui top attached header center">
+						{{.locale.Tr "auth.oauth_signup_title"}}
+					</h4>
+					<div class="ui attached segment">
+						<form class="ui form" action="{{.SignUpLink}}" method="post">
+							{{.CsrfTokenHtml}}
+
+							{{template "base/alert" .}}
+
+							<div class="disabled required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
+								<label for="user_name">{{.locale.Tr "username"}}</label>
+								<input disabled id="user_name" type="text" name="user_name" value="{{.user_name}}" required style="opacity: var(--opacity-disabled)">
+							</div>
+							<div class="disabled required inline field {{if .Err_Email}}error{{end}}">
+								<label for="email">{{.locale.Tr "email"}}</label>
+								<input disabled id="email" name="email" type="email" value="{{.email}}" required style="opacity: var(--opacity-disabled)">
+							</div>
+
+							<div class="inline field">
+								<label></label>
+								<button class="ui green button">
+									<span class="pr-2">{{svg "octicon-check"}}</span>
+									{{/* .locale.Tr "auth.oauth_signup_submit" */}}
+									Complete Registration
+								</button>
+							</div>
+
+						</form>
+					</div>
+				</div>
+
+			</div>
+		</div>
+	</div>
+</div>
+
+{{template "base/footer" .}}
diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl
deleted file mode 100644
index 9999116..0000000
--- a/templates/user/auth/signup.tmpl
+++ /dev/null
@@ -1,50 +0,0 @@
-{{template "base/head" .}}
-
-<div class="page-content user signin icon">
-	{{/* template "user/auth/signin_navbar" . */}}
-	<div class="ui middle very relaxed page grid">
-		<div class="ui container column fluid">
-			{{/* template "user/auth/signin_inner" . */}}
-
-			<div class="ui container column fluid icon">
-				<h4 class="ui top attached header center">
-					{{.locale.Tr "auth.oauth_signup_title"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" action="{{.SignUpLink}}" method="post">
-						{{.CsrfTokenHtml}}
-
-						{{template "base/alert" .}}
-
-						<div class="ui positive message flash-info">
-							<p>
-								Username and email are provided by your Blender ID.<br/>
-								Press "Complete Registration" to continue.
-							</p>
-						</div>
-
-						<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
-							<label for="user_name">{{.locale.Tr "username"}}</label>
-							<input disabled id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
-						</div>
-						<div class="required inline field {{if .Err_Email}}error{{end}}">
-							<label for="email">{{.locale.Tr "email"}}</label>
-							<input disabled id="email" name="email" type="email" value="{{.email}}" required>
-						</div>
-
-						<div class="inline field">
-							<label></label>
-							<button class="ui green button">
-								{{/* .locale.Tr "auth.oauth_signup_submit" */}}
-								Complete Registration
-							</button>
-						</div>
-
-					</form>
-				</div>
-			</div>
-
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}