diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index e0a19a97433..3124048d36e 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -48,10 +48,11 @@
 			</div>
 		</form>
 		{{end}}{{/*if .EnablePasswordSignInForm*/}}
-		{{if and .OAuth2Providers .EnableOpenIDSignIn .EnablePasswordSignInForm}}
+		{{$showOAuth2Methods := or .OAuth2Providers .EnableOpenIDSignIn}}
+		{{if and $showOAuth2Methods .EnablePasswordSignInForm}}
 			<div class="divider divider-text">{{ctx.Locale.Tr "sign_in_or"}}</div>
 		{{end}}
-		{{if and .OAuth2Providers .EnableOpenIDSignIn}}
+		{{if $showOAuth2Methods}}
 			{{template "user/auth/oauth_container" .}}
 		{{end}}
 	</div>
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index 69690039686..41d0cd49b52 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -47,8 +47,8 @@
 					</button>
 				</div>
 			{{end}}
-
-			{{if and .OAuth2Providers .EnableOpenIDSignIn}}
+			{{$showOAuth2Methods := or .OAuth2Providers .EnableOpenIDSignIn}}
+			{{if $showOAuth2Methods}}
 				<div class="divider divider-text">{{ctx.Locale.Tr "sign_in_or"}}</div>
 				{{template "user/auth/oauth_container" .}}
 			{{end}}