diff --git a/src/main/java/com/google/gerrit/server/config/AuthConfig.java b/src/main/java/com/google/gerrit/server/config/AuthConfig.java
index 5b88e58e03..d368dcba77 100644
--- a/src/main/java/com/google/gerrit/server/config/AuthConfig.java
+++ b/src/main/java/com/google/gerrit/server/config/AuthConfig.java
@@ -61,8 +61,12 @@ public class AuthConfig {
     anonymousGroups = Collections.singleton(s.anonymousGroupId);
     administratorGroup = s.adminGroupId;
 
-    allowGoogleAccountUpgrade =
-        cfg.getBoolean("auth", "allowgoogleaccountupgrade", false);
+    if (loginType == AuthType.OPENID) {
+      allowGoogleAccountUpgrade =
+          cfg.getBoolean("auth", "allowgoogleaccountupgrade", false);
+    } else {
+      allowGoogleAccountUpgrade = false;
+    }
   }
 
   private String[] toTrusted(final Config cfg) {