diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala
index dcb2dde82..426ec631a 100644
--- a/src/main/scala/app/IndexController.scala
+++ b/src/main/scala/app/IndexController.scala
@@ -35,7 +35,7 @@ trait IndexControllerBase extends ControllerBase {
   }
 
   post("/signin", form){ form =>
-    authenticate(loadSystemSettings(), form.userName, form.password) match {
+    authenticate(context.settings, form.userName, form.password) match {
       case Some(account) => signin(account)
       case None          => redirect("/signin")
     }
diff --git a/src/main/scala/app/SystemSettingsController.scala b/src/main/scala/app/SystemSettingsController.scala
index f6eb65f17..478c7c59e 100644
--- a/src/main/scala/app/SystemSettingsController.scala
+++ b/src/main/scala/app/SystemSettingsController.scala
@@ -7,10 +7,10 @@ import jp.sf.amateras.scalatra.forms._
 import ssh.SshServer
 
 class SystemSettingsController extends SystemSettingsControllerBase
-  with SystemSettingsService with AccountService with AdminAuthenticator
+  with AccountService with AdminAuthenticator
 
 trait SystemSettingsControllerBase extends ControllerBase {
-  self: SystemSettingsService with AccountService with AdminAuthenticator =>
+  self: AccountService with AdminAuthenticator =>
 
   private val form = mapping(
     "baseUrl"                  -> trim(label("Base URL", optional(text()))),