diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
index 7a3ada6fb46f699e38ce03d3e81d5129936040b7..4b048dba683b5acd5f4fbe872565901986948216 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
@@ -179,7 +179,7 @@ class LoginFragment: Fragment() {
                 binding.viewmodel?.setServerContext()
 
                 if (checkServer()) {
-                    loginAlert(R.string.login_server_check_alert)
+                    whenAuthorizationSucceeds()
                 } else {
                     try {
                         startAuthorization()
@@ -254,6 +254,8 @@ class LoginFragment: Fragment() {
         for (server in serverList) {
             val serverName = LoginRepository(server).loadServerUrl()
             if (serverName == serverHost) {
+                ServerRepository().setServer(server)
+                ServerRepository().changeServerList(server)
                 return true
             }
         }