diff --git a/UI/Common/UIxUserRightsEditor.m b/UI/Common/UIxUserRightsEditor.m
index 0546374cd..75af44603 100644
--- a/UI/Common/UIxUserRightsEditor.m
+++ b/UI/Common/UIxUserRightsEditor.m
@@ -57,6 +57,11 @@
[super dealloc];
}
+- (void) setUid: (NSString *) _uid
+{
+ ASSIGNCOPY (self->uid, _uid);
+}
+
- (NSString *) uid
{
return uid;
diff --git a/UI/Scheduler/UIxCalUserRightsEditor.m b/UI/Scheduler/UIxCalUserRightsEditor.m
index bc2a0afc7..1c7295aa0 100644
--- a/UI/Scheduler/UIxCalUserRightsEditor.m
+++ b/UI/Scheduler/UIxCalUserRightsEditor.m
@@ -124,7 +124,7 @@
if ([currentValue isEqualToString: @"None"])
[self removeAllRightsFromList: rightsForType];
- else
+ else if ([rightsForType containsObject: currentValue])
[self appendExclusiveRight: [NSString stringWithFormat: @"%@%@",
currentType, currentValue]
fromList: rightsForType];
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 074260f45..41fcff933 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -554,7 +554,7 @@
-
+
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index f068a7df5..50faf239a 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -583,6 +583,11 @@
+
+
+