diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index c0a4cff9..b1f1ee02 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -124,6 +124,11 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('hideBotIndication')
   copyInstanceOption('hideUserStats')
   copyInstanceOption('hideFilteredStatuses')
+  copyInstanceOption('hideSiteName')
+  copyInstanceOption('hideSiteFavicon')
+  copyInstanceOption('showWiderShortcuts')
+  copyInstanceOption('showNavShortcuts')
+  copyInstanceOption('showPanelNavShortcuts')
   copyInstanceOption('logo')
 
   store.dispatch('setInstanceOption', {
@@ -154,6 +159,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('alwaysShowSubjectInput')
   copyInstanceOption('showFeaturesPanel')
   copyInstanceOption('hideSitename')
+  copyInstanceOption('renderMisskeyMarkdown')
   copyInstanceOption('sidebarRight')
 
   return store.dispatch('setTheme', config['theme'])
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index 0d4127b6..e384b745 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -10,6 +10,11 @@ import HashtagLink from 'src/components/hashtag_link/hashtag_link.vue'
 
 import './rich_content.scss'
 
+const selectContent = (html, sourceContent, mfm) => {
+  if (!mfm) return html
+  return sourceContent === '' ? html : sourceContent
+}
+
 /**
  * RichContent, The Über-powered component for rendering Post HTML.
  *
@@ -66,6 +71,11 @@ export default {
       required: false,
       type: Boolean,
       default: false
+    },
+    sourceContent: {
+      required: false,
+      type: String,
+      default: ''
     }
   },
   // NEVER EVER TOUCH DATA INSIDE RENDER
@@ -74,7 +84,8 @@ export default {
     const greentext = this.mfm ? false : this.greentext
 
     // Pre-process HTML
-    const { newHtml: html } = preProcessPerLine(this.html, greentext)
+    const useContent = selectContent(this.html, this.sourceContent, this.mfm)
+    const { newHtml: html } = preProcessPerLine(useContent, greentext)
     let currentMentions = null // Current chain of mentions, we group all mentions together
     // This is used to recover spacing removed when parsing mentions
     let lastSpacing = ''
@@ -169,7 +180,7 @@ export default {
     }
 
     // Processor to use with html_tree_converter
-    const processItem = (item, index, array, what) => {
+    const processItem = (item, index, array) => {
       // Handle text nodes - just add emoji
       if (typeof item === 'string') {
         const emptyText = item.trim() === ''
diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue
index 321f3c4b..5a5f3e5e 100644
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@@ -52,6 +52,7 @@
             :emoji="status.emojis"
             :handle-links="true"
             :mfm="renderMisskeyMarkdown && (status.media_type === 'text/x.misskeymarkdown')"
+            :sourceContent="status.source_content"
             :greentext="mergedConfig.greentext"
             :attentions="status.attentions"
             @parseReady="onParseReady"
diff --git a/src/modules/users.js b/src/modules/users.js
index 02a9e361..5daf3862 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -589,7 +589,7 @@ const users = {
               const response = data.error
               // Authentication failed
               commit('endLogin')
-              if (response.status === 401) {
+              if (response.status === 401 || response.status === 403) {
                 reject(new Error('Wrong username or password'))
               } else {
                 reject(new Error('An error occurred, please try again'))
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index b66191bf..29032a65 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -282,6 +282,7 @@ export const parseStatus = (data) => {
       const { akkoma } = data
       if (akkoma && akkoma.source) {
         output.media_type = akkoma.source.mediaType
+        output.source_content = akkoma.source.content
       }
     }