diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index ba7d525e4..dc2a9a021 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -14,7 +14,7 @@ function validateEditorInput(sender) {
   if (field.value == "")
     errortext = errortext + labels.error_missingsubject + "\n";
 
-  if (!UIxRecipientSelectorHasRecipients())
+  if (!hasRecipients())
     errortext = errortext + labels.error_missingrecipients + "\n";
   
   if (errortext.length > 0) {
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 6e4d62e04..a87b84a81 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -405,7 +405,7 @@ function openMailbox(mailbox, reload, idx) {
     var url = ApplicationBaseURL + encodeURI(mailbox) + "/view?noframe=1";
     var messageContent = $("messageContent");
     messageContent.update();
-    lastClickedRow = null; // from generic.js
+    lastClickedRow = -1; // from generic.js
 
     var currentMessage;
     if (!idx) {
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index e896992a6..361c0708d 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -317,7 +317,7 @@ function eventsListCallback(http) {
     var params = parseQueryParameters(http.callbackData);
     sortKey = params["sort"];
     sortOrder = params["desc"];
-    lastClickedRow = null; // from generic.js
+    lastClickedRow = -1; // from generic.js
 
     if (http.responseText.length > 0) {
       var data = http.responseText.evalJSON(true);
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index 2c8b26b77..212f17152 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -129,7 +129,7 @@ function validateEditorInput(sender) {
   if (field.value == "")
     errortext = errortext + labels["error_missingsubject"] + "\n";
 
-  if (!UIxRecipientSelectorHasRecipients())
+  if (!hasRecipients())
     errortext = errortext + labels["error_missingrecipients"] + "\n";
    
   if (errortext.length > 0) {
diff --git a/UI/WebServerResources/UIxMailToSelection.js b/UI/WebServerResources/UIxMailToSelection.js
index 8c04320c0..df7c1a68c 100644
--- a/UI/WebServerResources/UIxMailToSelection.js
+++ b/UI/WebServerResources/UIxMailToSelection.js
@@ -23,7 +23,7 @@
  * It's required that "currentIndex" is defined in a top level context.
  *
  * Exports:
- * defines UIxRecipientSelectorHasRecipients() returning a bool for the
+ * defines hasRecipients() returning a bool for the
  * surrounding context to check.
  */
 
@@ -179,16 +179,16 @@ function getAddressIDs() {
 
   addressIDs = new Array();
 
-  addressList = $("addressList");
+  addressList = $("addressList").tBodies[0];
   rows  = addressList.childNodes;
   count = rows.length;
 
   for (i = 0; i < count; i++) {
     var row, rowId;
     
-    row = addressList.childNodes[i];
+    row = rows[i];
     rowId = row.id;
-    if (rowId && rowId != 'row_last') {
+    if (rowId && rowId != 'lastRow') {
       var idx;
 
       idx = this.getIndexFromIdentifier(rowId);
@@ -215,7 +215,7 @@ function getAddressCount() {
   return addressCount;
 }
 
-function UIxRecipientSelectorHasRecipients() {
+function hasRecipients() {
   var count;
   
   count = this.getAddressCount();
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 044347e60..5103916e3 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -31,7 +31,7 @@ var menus = new Array();
 var search = {};
 var sorting = {};
 
-var lastClickedRow = null;
+var lastClickedRow = -1;
 
 var weekStartIsMonday = true;
 
@@ -495,7 +495,7 @@ function onRowClick(event) {
 
   var initialSelection = $(node.parentNode).getSelectedNodes();
   if ((event.shiftKey == 1 || event.ctrlKey == 1)
-      && lastClickedRow
+      && (lastClickedRow >= 0)
       && (acceptMultiSelect(node.parentNode)
 	  || acceptMultiSelect(node.parentNode.parentNode))) {
     if (event.shiftKey)