diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index fa2ba949f..9c7bcf587 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -533,6 +533,7 @@ function onAddressBookNew(event) {
 
 function appendAddressBook(name, folder) {
   var owner;
+  var result = true;
 
   if (folder) {
     owner = getSubscribedFolderOwner(folder);
@@ -545,7 +546,7 @@ function appendAddressBook(name, folder) {
     owner = UserLogin;
 
   if ($(folder))
-    window.alert(clabels["You have already subscribed to that folder!"]);
+    result = false;
   else {
     var contactFolders = $("contactFolders");
     var items = contactFolders.childNodesWithTag("li");
@@ -563,6 +564,8 @@ function appendAddressBook(name, folder) {
     li.appendChild(document.createTextNode(name));
     setEventsOnContactFolder(li);
   }
+
+  return result;
 }
 
 function newFolderCallback(http) {
diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js
index fe55efc34..7ad090869 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.js
+++ b/UI/WebServerResources/UIxContactsUserFolders.js
@@ -133,7 +133,8 @@ function onConfirmFolderSelection(event) {
 	 folderName = spans1[0].innerHTML + ' (' + email + ')';
       }
       var data = { folderName: folderName, folder: folder, window: window };
-      window.opener.subscribeToFolder(window.opener.userFolderCallback, data);
+      if (!window.opener.subscribeToFolder(window.opener.userFolderCallback, data))
+	window.alert(clabels["You have already subscribed to that folder!"]);
    }
 }