diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index f868028be91..07230fe8a24 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -447,26 +447,18 @@ class Crypt {
 	}
 
 	public static function changekeypasscode($oldPassword, $newPassword) {
+
 		if(\OCP\User::isLoggedIn()){
-			$username = \OCP\USER::getUser();
-			$view = new \OC_FilesystemView('/'.$username);
-
-			// read old key
 			$key = Keymanager::getPrivateKey();
-
-			// decrypt key with old passcode
-			if ( ($key = self::decrypt($key, $oldPassword)) ) {
-				// encrypt again with new passcode
-				$key = self::encrypt($key, $newPassword);
-
-				// store the new key
-				return Keymanager::setPrivateKey($key);
-			} else {
-				return false;
+			if ( ($key = Crypt::symmetricDecryptFileContent($key,$oldpasswd)) ) {
+				if ( ($key = Crypt::symmetricEncryptFileContent($key, $newpasswd)) ) {
+					Keymanager::setPrivateKey($key);
+					return true;
+				}
 			}
 		}
+		return false;
 	}
-
 }
 
 ?>
\ No newline at end of file
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 8d81c97cfa3..1ffeff99288 100644
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -219,13 +219,7 @@ class Keymanager {
 	public static function changePasswd($oldpasswd, $newpasswd) {
 		
 		if ( \OCP\User::checkPassword(\OCP\User::getUser(), $newpasswd) ) {
-			$key = Keymanager::getPrivateKey();
-			if ( ($key = Crypt::symmetricDecryptFileContent($key,$oldpasswd)) ) {
-				if ( ($key = Crypt::symmetricEncryptFileContent($key, $newpasswd)) ) {
-					Keymanager::setPrivateKey($key);
-					return true;
-				}
-			}
+			return Crypt::changekeypasscode($oldpasswd, $newpasswd);
 		}
 		return false;