diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml
index e1959ac8a9b..f35a87aa4f2 100644
--- a/apps/encryption/appinfo/info.xml
+++ b/apps/encryption/appinfo/info.xml
@@ -19,7 +19,7 @@
 		<user>user-encryption</user>
 		<admin>admin-encryption</admin>
 	</documentation>
-	<version>1.7.1</version>
+	<version>2.0.0</version>
 	<types>
 		<filesystem/>
 	</types>
@@ -36,4 +36,10 @@
 		<command>OCA\Encryption\Command\DisableMasterKey</command>
 		<command>OCA\Encryption\Command\MigrateKeys</command>
 	</commands>
+
+	<repair-steps>
+		<post-migration>
+			<step>OCA\Encryption\Migration\SetMasterKeyStatus</step>
+		</post-migration>
+	</repair-steps>
 </info>
diff --git a/apps/encryption/lib/Migration/SetMasterKeyStatus.php b/apps/encryption/lib/Migration/SetMasterKeyStatus.php
new file mode 100644
index 00000000000..a21d0acae24
--- /dev/null
+++ b/apps/encryption/lib/Migration/SetMasterKeyStatus.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @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\Encryption\Migration;
+
+
+use OCP\IConfig;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+/**
+ * Class SetPasswordColumn
+ *
+ * @package OCA\Files_Sharing\Migration
+ */
+class SetMasterKeyStatus implements IRepairStep {
+
+
+	/** @var  IConfig */
+	private $config;
+
+
+	public function __construct(IConfig $config) {
+		$this->config = $config;
+	}
+
+	/**
+	 * Returns the step's name
+	 *
+	 * @return string
+	 * @since 9.1.0
+	 */
+	public function getName() {
+		return 'Write default encryption module configuration to the database';
+	}
+
+	/**
+	 * @param IOutput $output
+	 */
+	public function run(IOutput $output) {
+		if (!$this->shouldRun()) {
+			return;
+		}
+
+		// if no config for the master key is set we set it explicitly to '0' in
+		// order not to break old installations because the default changed to '1'.
+		$configAlreadySet = $this->config->getAppValue('encryption', 'useMasterKey', false);
+		if ($configAlreadySet === false) {
+			$this->config->setAppValue('encryption', 'useMasterKey', '0');
+		}
+	}
+
+	protected function shouldRun() {
+		$appVersion = $this->config->getAppValue('encryption', 'installed_version', '0.0.0');
+		return version_compare($appVersion, '2.0.0', '<');
+	}
+
+}