diff --git a/classes/dlg.php b/classes/dlg.php
index d3e82ee59..0356ad3aa 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -199,7 +199,7 @@ class Dlg extends Handler_Protected {
 		print "<button dojoType='dijit.form.Button' onclick=\"document.location.href = 'prefs.php'\">".
 			__('Open Preferences')."</button> ";
 		print "<button dojoType='dijit.form.Button'
-			onclick=\"return CommonDialogs.closeInfoBox()\">".
+			onclick=\"return dijit.byId('defaultPasswordDlg').hide();\">".
 			__('Close this window')."</button>";
 		print "</footeer>";
 	}
diff --git a/js/Feeds.js b/js/Feeds.js
index ae9352064..9a27de82b 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -221,6 +221,9 @@ define(["dojo/_base/declare"], function (declare) {
 			if (App.getInitParam("is_default_pw")) {
 				console.warn("user password is at default value");
 
+				if (dijit.byId("defaultPasswordDlg"))
+					dijit.byId("defaultPasswordDlg").destroyRecursive();
+
 				const dialog = new dijit.Dialog({
 					title: __("Your password is at default value"),
 					href: "backend.php?op=dlg&method=defaultpasswordwarning",