diff --git a/lib/foedus_web/router.ex b/lib/foedus_web/router.ex
index 87582f6..1053dca 100644
--- a/lib/foedus_web/router.ex
+++ b/lib/foedus_web/router.ex
@@ -28,7 +28,7 @@ defmodule FoedusWeb.Router do
     live_session :redirect_if_user_is_authenticated,
       on_mount: [{FoedusWeb.UserAuth, :redirect_if_user_is_authenticated}] do
       live "/", HomeLive.Index, :index
-      live "/users/log_in", UserLoginLive, :new
+      live "/users/log_in", UserAuth.UserLoginLive, :new
       live "/onboarding", OnboardingLive.Index, :index
 
       live "/users/reset_password", UserAuth.UserForgotPasswordLive, :new
diff --git a/test/support/factories/user_factory.ex b/test/support/factories/user_factory.ex
index 43a5c9f..92a8773 100644
--- a/test/support/factories/user_factory.ex
+++ b/test/support/factories/user_factory.ex
@@ -7,7 +7,7 @@ defmodule Foedus.UserFactory do
         %User{
           email: Faker.Internet.email(),
           hashed_password: Bcrypt.hash_pwd_salt("password123"),
-          company: build(:company)
+          company_id: insert(:company).id
         }
       end
     end