diff --git a/apps/accessibility/appinfo/info.xml b/apps/accessibility/appinfo/info.xml
index ee5e3e9a659..405aab9cc71 100644
--- a/apps/accessibility/appinfo/info.xml
+++ b/apps/accessibility/appinfo/info.xml
@@ -19,6 +19,12 @@
         <nextcloud min-version="18" max-version="18"/>
     </dependencies>
 
+	<repair-steps>
+		<pre-migration>
+			<step>OCA\Accessibility\Migration\RepairUserConfig</step>
+		</pre-migration>
+	</repair-steps>
+
     <settings>
         <personal>OCA\Accessibility\Settings\Personal</personal>
         <personal-section>OCA\Accessibility\Settings\PersonalSection</personal-section>
diff --git a/apps/accessibility/lib/Migration/RepairUserConfig.php b/apps/accessibility/lib/Migration/RepairUserConfig.php
new file mode 100644
index 00000000000..226f1414f3e
--- /dev/null
+++ b/apps/accessibility/lib/Migration/RepairUserConfig.php
@@ -0,0 +1,89 @@
+<?php
+declare (strict_types = 1);
+/**
+ * @author Janis Koehr <janiskoehr@icloud.com>
+ * @copyright Janis Koehr 2019
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Accessibility\Migration;
+
+use OCP\IConfig;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class RepairUserConfig implements IRepairStep {
+
+	/** @var string */
+	private const APP_NAME = 'accessibility';
+
+	/** @var IUserManager */
+	protected $userManager;
+
+	/** @var IConfig */
+	protected $config;
+
+	/**
+	 * MigrateUserConfig constructor.
+	 *
+	 * @param IConfig $config
+	 * @param IUserManager $userManager
+	 */
+	public function __construct(IConfig $config,
+								IUserManager $userManager) {
+		$this->config = $config;
+		$this->userManager = $userManager;
+	}
+
+	/**
+	 * Returns the step's name
+	 *
+	 * @return string
+	 * @since 9.1.0
+	 */
+	public function getName() {
+		return 'Migrate old user config';
+	}
+
+	/**
+	 * Run repair step.
+	 * Must throw exception on error.
+	 *
+	 * @param IOutput $output
+	 * @throws \Exception in case of failure
+	 * @since 9.1.0
+	 */
+	public function run(IOutput $output) {
+		$output->startProgress();
+		$this->userManager->callForSeenUsers(function(IUser $user) use ($output) {
+			$theme = $this->config->getUserValue($user->getUID(), self::APP_NAME, 'theme', false);
+			if ($theme === 'themedark') {
+				$this->config->setUserValue($user->getUID(), self::APP_NAME, 'theme', 'dark');
+			}
+			if ($theme === 'themehighcontrast') {
+				$this->config->setUserValue($user->getUID(), self::APP_NAME, 'highcontrast', 'highcontrast');
+				$this->config->deleteUserValue($user->getUID(), self::APP_NAME, 'theme');
+			}
+			$output->advance();
+		});
+		$output->finishProgress();
+	}
+
+}
diff --git a/apps/accessibility/src/App.vue b/apps/accessibility/src/App.vue
index 0fff2580d32..17c0ce63c5f 100644
--- a/apps/accessibility/src/App.vue
+++ b/apps/accessibility/src/App.vue
@@ -94,7 +94,9 @@ export default {
 		selectTheme(id, idSelectedBefore) {
 			this.selectItem('theme', id);
 			document.body.classList.remove(idSelectedBefore);
-			if (id) document.body.classList.add(id);
+			if (id) {
+				document.body.classList.add(id);
+			}
 		},
 		selectFont(id) {
 			this.selectItem('font', id);