diff options
| -rw-r--r-- | routers/web/auth/oauth.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index 287136e64c..92a06e7c14 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -966,7 +966,7 @@ func SignInOAuthCallback(ctx *context.Context) { } overwriteDefault := &user_model.CreateUserOverwriteOptions{ - IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm), + IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm && !setting.Service.RegisterManualConfirm), } source := authSource.Cfg.(*oauth2.Source) |