diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php
index d189ce3eeeffb..65d8c24ee8a7d 100644
--- a/apps/encryption/lib/Hooks/UserHooks.php
+++ b/apps/encryption/lib/Hooks/UserHooks.php
@@ -155,9 +155,9 @@ public function addHooks() {
 				'postCreateUser');
 
 			OCUtil::connectHook('OC_User',
-				'post_deleteUser',
+				'pre_deleteUser',
 				$this,
-				'postDeleteUser');
+				'preDeleteUser');
 		}
 	}
 
@@ -212,7 +212,7 @@ public function postCreateUser($params) {
 	 * @param array $params : uid, password
 	 * @note This method should never be called for users using client side encryption
 	 */
-	public function postDeleteUser($params) {
+	public function preDeleteUser($params) {
 
 		if (App::isEnabled('encryption')) {
 			$this->keyManager->deletePublicKey($params['uid']);
diff --git a/apps/encryption/tests/Hooks/UserHooksTest.php b/apps/encryption/tests/Hooks/UserHooksTest.php
index f9477e3e03856..0b8bd63e14376 100644
--- a/apps/encryption/tests/Hooks/UserHooksTest.php
+++ b/apps/encryption/tests/Hooks/UserHooksTest.php
@@ -111,12 +111,12 @@ public function testPostCreateUser() {
 		$this->assertTrue(true);
 	}
 
-	public function testPostDeleteUser() {
+	public function testPreDeleteUser() {
 		$this->keyManagerMock->expects($this->once())
 			->method('deletePublicKey')
 			->with('testUser');
 
-		$this->instance->postDeleteUser($this->params);
+		$this->instance->preDeleteUser($this->params);
 		$this->assertTrue(true);
 	}