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 9c28d6b0b16b8f37416e081b56972705afecfb9d..c44f021677cc2e7a72b4deeb2756b442f32c6fc4 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
@@ -83,8 +83,11 @@ class LoginFragment: Fragment() {
         if (requireActivity().intent.action != LoginActivity.ACTION_ADD_SERVER) {
             binding.viewmodel?.fetchServerUrl()
             binding.viewmodel?.fetchServerContext()
-            setupObservers()
+        } else {
+            binding.viewmodel?.refreshServerUrl()
+            binding.viewmodel?.refreshServerContext()
         }
+        setupObservers()
 
         mOAuthService.initAuthService(requireContext());
 
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginViewModel.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginViewModel.kt
index 55e3c39467bcd447ea3de129f72da48abce28923..e690060083fe3cd685d5981ea0c00d19e6fc7a32 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginViewModel.kt
@@ -30,6 +30,10 @@ class LoginViewModel: BaseViewModel() {
         return serverUrlLive.value
     }
 
+    fun refreshServerUrl() {
+        serverUrlLive.value = ""
+    }
+
     fun loadServerContext(serverContext: String) {
         if (serverContext.isBlank()) {
             serverContextLive.value = serverContext
@@ -50,6 +54,10 @@ class LoginViewModel: BaseViewModel() {
         return serverContextLive.value
     }
 
+    fun refreshServerContext() {
+        serverContextLive.value = ""
+    }
+
     private fun String.stripScheme(): String = SCHEME_PATTERN.replaceFirst(this, "")
     companion object {
         private val SCHEME_PATTERN = Regex("^https?://")