diff --git a/templates/user/auth/oauth_container.tmpl b/templates/user/auth/oauth_container.tmpl
new file mode 100644
index 0000000000..09159d8249
--- /dev/null
+++ b/templates/user/auth/oauth_container.tmpl
@@ -0,0 +1,21 @@
+
+ {{ctx.Locale.Tr "sign_in_or"}}
+
+
\ No newline at end of file
diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index e88bf24254..a61c792ac0 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -49,26 +49,8 @@
{{end}}
-
- {{ctx.Locale.Tr "sign_in_or"}}
-
-
+ {{if or .OAuth2Providers .EnableOpenIDSignIn}}
+ {{template "user/auth/oauth_container" .}}
+ {{end}}
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index 72a42263c8..29e498c400 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -53,28 +53,9 @@
{{end}}
{{end}}
-
-
- {{ctx.Locale.Tr "sign_in_or"}}
-
-
+ {{if or .OAuth2Providers .EnableOpenIDSignIn}}
+ {{template "user/auth/oauth_container" .}}
+ {{end}}