diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 32f06a965..e65f95c3d 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -480,10 +480,8 @@
     [unavailableAttendees release];
     return [NSException exceptionWithHTTPStatus:403 reason: reason];
   }
-  else {
-    [unavailableAttendees release];
-    return nil;
-  }
+  [unavailableAttendees release];
+  return nil;
 }
 
 //
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 7e176c591..ffd641912 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -640,7 +640,7 @@ static NSArray *reminderValues = nil;
   return [userDefaults busyOffHours];
 }
 
-- (NSArray *) whiteListValue
+- (NSArray *) whiteList
 {
   SOGoUserSettings *us;
   NSMutableDictionary *moduleSettings;
@@ -652,7 +652,7 @@ static NSArray *reminderValues = nil;
   return whiteList;
 }
 
-- (void) setWhiteListValue: (NSArray *) whiteList
+- (void) setWhiteList: (NSArray *) whiteList
 {
   SOGoUserSettings *us;
   NSMutableDictionary *moduleSettings;
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index fcef5e7ff..e29a95b88 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -248,8 +248,8 @@
               <a const:id="appointmentsWhiteListDelete" href="#">
                 <img rsrc:src="remove-icon.png" label:title="Delete" id="WhiteListDelete" /></a>
             </div>
-            <input type="hidden" const:id="whiteListValue"
-            const:name="whiteListValue" var:value="whiteListValue"/>
+            <input type="hidden" const:id="whiteList"
+            const:name="whiteList" var:value="whiteList"/>
             
             <label id="calendarCategoriesLabel"><var:string label:value="Categories"/></label>
             <div id="calendarCategoriesListWrapper" class="listWrapper">
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 3fd286882..f4a6d65ec 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -229,7 +229,7 @@ function initPreferences() {
   // Calendar whiteList
   var whiteList = $("appointmentsWhiteListWrapper");
   if(whiteList) {
-    var whiteListValue = $("whiteListValue").getValue();
+    var whiteListValue = $("whiteList").getValue();
     if (whiteListValue != "") {
       whiteListValue = whiteListValue.split(",");
       var tablebody = $("appointmentsWhiteListWrapper").childNodesWithTag("table")[0].tBodies[0];
@@ -1133,8 +1133,8 @@ function serializeAppointmentsWhiteList() {
     var user = uid + "=" + value;
     if (uid != null)
       values.push(user);
-  
-  $("whiteListValue").value = values;
+  }
+  $("whiteList").value = values;
 }
 
 function onCalendarCategoryAdd(e) {