diff --git a/src/Ldap/Client/Instances.hs b/src/Ldap/Client/Instances.hs
index 19c1ae6bf..080c84f75 100644
--- a/src/Ldap/Client/Instances.hs
+++ b/src/Ldap/Client/Instances.hs
@@ -10,6 +10,7 @@ module Ldap.Client.Instances
 
 import ClassyPrelude
 
+import Data.Aeson.TH
 import Data.Data (Data)
 
 import Database.Persist.TH (derivePersistField)
@@ -51,3 +52,5 @@ derivePathPiece ''Scope id "--"
 derivePersistField "Dn"
 derivePersistField "Password"
 derivePersistField "Scope"
+
+deriveFromJSON defaultOptions ''Scope
diff --git a/src/Settings/Ldap.hs b/src/Settings/Ldap.hs
index 1ef5081be..44d0a4dd9 100644
--- a/src/Settings/Ldap.hs
+++ b/src/Settings/Ldap.hs
@@ -16,11 +16,11 @@ import Utils.Lens.TH
 import Control.Monad.Fail (fail)
 
 import Data.Aeson
-import Data.Aeson.TH
 import qualified Data.Text.Encoding as Text
 import Data.Time.Clock
 
 import qualified Ldap.Client as Ldap
+import Ldap.Client.Instances ()
 
 
 data LdapConf = LdapConf
@@ -36,8 +36,6 @@ data LdapConf = LdapConf
 
 makeLenses_ ''LdapConf
 
-deriveFromJSON defaultOptions ''Ldap.Scope -- TODO: move to Ldap.Client.Instances
-
 instance FromJSON LdapConf where
   parseJSON = withObject "LdapConf" $ \o -> do
     ldapConfTls <- o .:? "tls"