diff --git a/mozilla/calendar/resources/content/calendarManager.js b/mozilla/calendar/resources/content/calendarManager.js
index 3ee9d28530f..5be71fd8a75 100644
--- a/mozilla/calendar/resources/content/calendarManager.js
+++ b/mozilla/calendar/resources/content/calendarManager.js
@@ -727,7 +727,13 @@ calendarManager.prototype.getRemoteCalendarText = function calMan_getRemoteCalen
          // use the window watcher service to get a nsIAuthPrompt impl
          var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
                             .getService(Components.interfaces.nsIWindowWatcher);
-         return ww.getNewAuthPrompter(null);
+         return ww.getNewAuthPrompter(window);
+       }
+       else if (iid.equals(Components.interfaces.nsIPrompt)) {
+         // use the window watcher service to get a nsIPrompt impl
+         var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+                            .getService(Components.interfaces.nsIWindowWatcher);
+         return ww.getNewPrompter(window);
        }
        Components.returnCode = Components.results.NS_ERROR_NO_INTERFACE;
        return null;