diff --git a/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp b/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp
index ce5be00d4..f3830f82a 100644
--- a/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp
+++ b/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp
@@ -20,6 +20,9 @@
 #include "pluginproxy.h"
 #include "browserwindow.h"
 #include "../config.h"
+#include "mainapplication.h"
+#include "autofill.h"
+#include "passwordmanager.h"
 
 #include <QTranslator>
 
@@ -54,7 +57,7 @@ void GnomeKeyringPlugin::init(InitState state, const QString &settingsPath)
 
 void GnomeKeyringPlugin::unload()
 {
-    QZ_UNREGISTER_PASSWORD_BACKEND(m_backend);
+    mApp->autoFill()->passwordManager()->unregisterBackend(m_backend);
     delete m_backend;
 }
 
diff --git a/src/plugins/KWalletPasswords/kwalletplugin.cpp b/src/plugins/KWalletPasswords/kwalletplugin.cpp
index 0bc2b8392..19f493607 100644
--- a/src/plugins/KWalletPasswords/kwalletplugin.cpp
+++ b/src/plugins/KWalletPasswords/kwalletplugin.cpp
@@ -20,6 +20,9 @@
 #include "pluginproxy.h"
 #include "browserwindow.h"
 #include "../config.h"
+#include "mainapplication.h"
+#include "autofill.h"
+#include "passwordmanager.h"
 
 #include <QTranslator>
 
@@ -54,7 +57,7 @@ void KWalletPlugin::init(InitState state, const QString &settingsPath)
 
 void KWalletPlugin::unload()
 {
-    QZ_UNREGISTER_PASSWORD_BACKEND(m_backend);
+    mApp->autoFill()->passwordManager()->unregisterBackend(m_backend);
     delete m_backend;
 }