diff --git a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
index 21bb79e..ae65759 100644
--- a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
+++ b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
@@ -6,10 +6,12 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.example.nemophila.entities.Account;
 import com.example.nemophila.viewmodels.AccountViewModel;
@@ -43,8 +45,8 @@
                 TextView myName = (TextView) findViewById(R.id.editName);
                 myName.setText(name);
                 nemophila.setName(name);
-                Intent intent = new Intent(MyPageEditorActivity.this, MyPageActivity.class);
-                startActivity(intent);
+//                Intent intent = new Intent(MyPageEditorActivity.this, MyPageActivity.class);
+//                startActivity(intent);
             }
 
         });
@@ -56,6 +58,15 @@
             }
 
         });
+        accountViewModel.getPwErrorLiveData().observe(this, new Observer<String>() {
+            @Override
+            public void onChanged(String name) {
+                Toast ts = Toast.makeText(MyPageEditorActivity.this, "パスワードが間違っています", Toast.LENGTH_SHORT);
+                ts.setGravity(Gravity.CENTER, 0, 0);
+                ts.show();
+            }
+
+        });
 
         //変更確定ボタンを押した場合の動き
         Button changeNameButton = (Button) findViewById(R.id.changeConfirm);
diff --git a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
index d28414b..d5dcbed 100644
--- a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
+++ b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
@@ -1,5 +1,8 @@
 package com.example.nemophila.viewmodels;
 
+import android.widget.TextView;
+
+import com.example.nemophila.R;
 import com.example.nemophila.entities.Account;
 import com.example.nemophila.entities.AccountJson;
 import com.example.nemophila.entities.Post;
@@ -27,6 +30,7 @@
     private final MutableLiveData<String> nameLiveData;
     private final MutableLiveData<String> pwLiveData;
     private final MutableLiveData<Collection<Post>> accountPostsLiveData;
+    private final MutableLiveData<String> pwErrorLiveData;
 
     // コンストラクタ
     public AccountViewModel() {
@@ -38,6 +42,7 @@
         this.nameLiveData = new MutableLiveData<>();
         this.pwLiveData = new MutableLiveData<>();
         this.accountPostsLiveData = new MutableLiveData<>();
+        this.pwErrorLiveData = new MutableLiveData<>();
     }
 
     // ライブデータの取得（ゲッター）
@@ -48,6 +53,9 @@
         return pwLiveData;
     }
     public MutableLiveData<Collection<Post>> getAccountPostsLiveData() { return accountPostsLiveData; }
+    public MutableLiveData<String> getPwErrorLiveData() {
+        return pwErrorLiveData;
+    }
 
     // 対象のアカウント情報の削除
     public void deleteAccount(String uid, String token) {
@@ -80,7 +88,11 @@
                     pwLiveData.setValue(newPw);
                     System.out.println("Success ChangePW");
                 } else {
-                    System.out.println("response error");
+                    if (response.code() == 401){
+                        pwErrorLiveData.setValue("error");
+                        System.out.println("miss ChangePW");
+                    }
+
                 }
             }
             @Override
diff --git a/app/src/main/res/layout/activity_my_page_editor.xml b/app/src/main/res/layout/activity_my_page_editor.xml
index eaf673f..f499bfb 100644
--- a/app/src/main/res/layout/activity_my_page_editor.xml
+++ b/app/src/main/res/layout/activity_my_page_editor.xml
@@ -35,7 +35,8 @@
         app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.456" />
+        app:layout_constraintVertical_bias="0.456"
+        android:hint="前のパスワード"/>
 
     <EditText
         android:id="@+id/editNewPw"
@@ -51,7 +52,8 @@
         app:layout_constraintHorizontal_bias="0.568"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/editOldPw"
-        app:layout_constraintVertical_bias="0.112" />
+        app:layout_constraintVertical_bias="0.112"
+        android:hint="新しいパスワード"/>
 
     <Button
         android:id="@+id/changeConfirm"