diff --git a/src/Settings.hs b/src/Settings.hs
index 753dd56d0..8c89aa3ce 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -298,7 +298,7 @@ makePrisms ''JobMode
 makeLenses_ ''JobMode
 
 deriveFromJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece' 2
+  { constructorTagModifier = toLower . dropPrefix "UserDb"
   , sumEncoding = TaggedObject "protocol" "config"
   } ''UserDbConf
 
diff --git a/src/Settings/OAuth2.hs b/src/Settings/OAuth2.hs
index 53877b0dd..98e1908b4 100644
--- a/src/Settings/OAuth2.hs
+++ b/src/Settings/OAuth2.hs
@@ -10,7 +10,7 @@ module Settings.OAuth2
 import ClassyPrelude
 
 import Utils.Lens.TH
-import Utils.PathPiece (camelToPathPiece')
+import Utils.PathPiece (camelToPathPiece)
 
 import Data.Aeson
 import Data.Aeson.TH
@@ -28,5 +28,5 @@ data OAuth2Conf = OAuth2Conf
 makeLenses_ ''OAuth2Conf
 
 deriveFromJSON defaultOptions
-  { fieldLabelModifier = camelToPathPiece' 1
+  { fieldLabelModifier = camelToPathPiece . dropPrefix "oauth2"
   } ''OAuth2Conf