diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 8c32b5f8d6..e7e67c0ac0 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -981,7 +981,7 @@ common/views/components/mute-and-block.vue:
   no-muted-users: "ミュートしているユーザーはいません"
   no-blocked-users: "ブロックしているユーザーはいません"
 
-desktop/views/components/settings.password.vue:
+common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
   enter-new-password: "新しいパスワードを入力してください"
@@ -1564,6 +1564,7 @@ mobile/views/pages/settings.vue:
   sound: "サウンド"
   enable-sounds: "サウンドを有効にする"
   mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  password: "パスワード"
 
 mobile/views/pages/user.vue:
   follows-you: "フォローされています"
diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts
index 2f2217f8d2..9eed2efc91 100644
--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@@ -3,6 +3,7 @@ import Vue from 'vue';
 import muteAndBlock from './mute-and-block.vue';
 import error from './error.vue';
 import apiSettings from './api-settings.vue';
+import passwordSettings from './password-settings.vue';
 import driveSettings from './drive-settings.vue';
 import profileEditor from './profile-editor.vue';
 import noteSkeleton from './note-skeleton.vue';
@@ -54,6 +55,7 @@ import formRadio from './ui/form/radio.vue';
 Vue.component('mk-mute-and-block', muteAndBlock);
 Vue.component('mk-error', error);
 Vue.component('mk-api-settings', apiSettings);
+Vue.component('mk-password-settings', passwordSettings);
 Vue.component('mk-drive-settings', driveSettings);
 Vue.component('mk-profile-editor', profileEditor);
 Vue.component('mk-note-skeleton', noteSkeleton);
diff --git a/src/client/app/desktop/views/components/settings.password.vue b/src/client/app/common/views/components/password-settings.vue
similarity index 100%
rename from src/client/app/desktop/views/components/settings.password.vue
rename to src/client/app/common/views/components/password-settings.vue
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index 4bc2f80479..983a0b9bc2 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -214,7 +214,7 @@
 		<ui-card class="password" v-show="page == 'security'">
 			<div slot="title">%fa:unlock-alt% %i18n:@password%</div>
 			<section>
-				<x-password/>
+				<mk-password-settings/>
 			</section>
 		</ui-card>
 
@@ -286,7 +286,6 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import XPassword from './settings.password.vue';
 import X2fa from './settings.2fa.vue';
 import XApps from './settings.apps.vue';
 import XSignins from './settings.signins.vue';
@@ -296,7 +295,6 @@ import checkForUpdate from '../../../common/scripts/check-for-update';
 
 export default Vue.extend({
 	components: {
-		XPassword,
 		X2fa,
 		XApps,
 		XSignins,
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index 267cfdb440..4512e9b2c2 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -127,6 +127,13 @@
 
 			<mk-api-settings />
 
+			<ui-card>
+				<div slot="title">%fa:unlock-alt% %i18n:@password%</div>
+				<section>
+					<mk-password-settings/>
+				</section>
+			</ui-card>
+
 			<ui-card>
 				<div slot="title">%fa:sync-alt% %i18n:@update%</div>