diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1f6cbec0fd5d735842a5ad99ed3427a7254a30ec..3c450c434ed58604aed9218429dcced4d64cb0ae 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,9 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
 
     <application
         android:name=".AwApp"
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 13a77d7cbf1f7d96f14da6d1fc5bdbdcef0dd688..9c28d6b0b16b8f37416e081b56972705afecfb9d 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
@@ -51,6 +51,7 @@ class LoginFragment: Fragment() {
     private var shouldClearTaskOnOAuthFailure = false
     private var disableButtonFlg = false
     private var tempServerNumber: Int? = 0
+    private var addServerFlg = false
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         Log.d(TAG, "call onCreateView()")
@@ -124,6 +125,7 @@ class LoginFragment: Fragment() {
             } else if (requireActivity().intent.action == LoginActivity.ACTION_ADD_SERVER) {
                 //サーバー追加のログイン画面
                 Log.d(TAG, "intent.action == LoginActivity.ACTION_ADD_SERVER")
+                addServerFlg = true
             } else {
                 // 過去に認証したときの authState を取得
                 if (mOAuthService.getAuthState(savedInstanceState).isAuthorized) {
@@ -178,7 +180,11 @@ class LoginFragment: Fragment() {
                 binding.viewmodel?.setServerContext()
 
                 if (checkServer()) {
-                    whenAuthorizationSucceeds()
+                    if(addServerFlg) {
+                        loginAlert(R.string.login_server_check_alert)
+                    } else {
+                        startAuthorization()
+                    }
                 } else {
                     try {
                         startAuthorization()
@@ -253,8 +259,6 @@ class LoginFragment: Fragment() {
         for (server in serverList) {
             val serverName = LoginRepository(server).loadServerUrl()
             if (serverName == serverHost) {
-                ServerRepository().setServer(server)
-                ServerRepository().changeServerList(server)
                 return true
             }
         }