diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go
index c20a45ebc9721..36cb244a856f6 100644
--- a/routers/web/auth/auth.go
+++ b/routers/web/auth/auth.go
@@ -390,6 +390,13 @@ func SignOut(ctx *context.Context) {
 func SignUp(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("sign_up")
 
+	orderedOAuth2Names, oauth2Providers, err := oauth2.GetActiveOAuth2Providers()
+	if err != nil {
+		ctx.ServerError("SignUp", err)
+		return
+	}
+	ctx.Data["OrderedOAuth2Names"] = orderedOAuth2Names
+	ctx.Data["OAuth2Providers"] = oauth2Providers
 	ctx.Data["SignUpLink"] = setting.AppSubURL + "/user/sign_up"
 
 	context.SetCaptchaData(ctx)
@@ -411,6 +418,13 @@ func SignUpPost(ctx *context.Context) {
 	form := web.GetForm(ctx).(*forms.RegisterForm)
 	ctx.Data["Title"] = ctx.Tr("sign_up")
 
+	orderedOAuth2Names, oauth2Providers, err := oauth2.GetActiveOAuth2Providers()
+	if err != nil {
+		ctx.ServerError("SignUpPost", err)
+		return
+	}
+	ctx.Data["OrderedOAuth2Names"] = orderedOAuth2Names
+	ctx.Data["OAuth2Providers"] = oauth2Providers
 	ctx.Data["SignUpLink"] = setting.AppSubURL + "/user/sign_up"
 
 	context.SetCaptchaData(ctx)
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index 8dfcb7b7d074f..0ddd6a1569501 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -54,6 +54,25 @@
 					<a href="{{AppSubUrl}}/user/login">{{.locale.Tr "auth.register_helper_msg"}}</a>
 				</div>
 				{{end}}
+
+				{{if and .OrderedOAuth2Names .OAuth2Providers}}
+					<div class="divider divider-text">
+						{{.locale.Tr "sign_in_or"}}
+					</div>
+					<div id="oauth2-login-navigator" class="gt-py-2">
+						<div class="gt-df gt-fc gt-jc">
+							<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
+								{{range $key := .OrderedOAuth2Names}}
+									{{$provider := index $.OAuth2Providers $key}}
+									<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$key}}">
+										{{$provider.IconHTML}}
+										{{$.locale.Tr "sign_in_with_provider" $provider.DisplayName}}
+									</a>
+								{{end}}
+							</div>
+						</div>
+					</div>
+				{{end}}
 			{{end}}
 		</form>
 	</div>