diff --git a/NEWS b/NEWS
index e1c14cc53..ad6a8415b 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Bug fixes
  - [web] calendar properties were not completely reset on cancel
  - [web] check ACLs on address book prior to delete cards
  - [web] fixed condition of copy action on cards
+ - [web] fixed display of notification email in calendar properties
 
 4.0.2 (2018-08-24)
 ------------------
diff --git a/UI/Scheduler/UIxCalendarProperties.m b/UI/Scheduler/UIxCalendarProperties.m
index 3932c2983..9be5c947f 100644
--- a/UI/Scheduler/UIxCalendarProperties.m
+++ b/UI/Scheduler/UIxCalendarProperties.m
@@ -86,7 +86,7 @@
   NS_DURING
     {
       o = [params objectForKey: @"name"];
-      if ([o isKindOfClass: [NSString class]])
+      if ([o isKindOfClass: [NSString class]] && ![o isEqualToString: [calendar displayName]])
         [calendar renameTo: o];
 
       o = [params objectForKey: @"color"];
diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index 09f29fcb8..a58157ed7 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -81,7 +81,7 @@
           <md-input-container flex-offset="5" md-no-float="md-no-float">
             <input type="email"
                    label:placeholder="Email Address"
-                   ng-model="properties.calendar.notifications.notifiedUserOnPersonalModifications"
+                   ng-model="properties.calendar.notifiedUserOnPersonalModifications"
                    ng-required="properties.calendar.notifications.notifyUserOnPersonalModifications"
                    ng-disabled="!properties.calendar.notifications.notifyUserOnPersonalModifications"/>
           </md-input-container>
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
index 7abf81a67..046965d54 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
@@ -253,10 +253,13 @@
 
             function saveProperties(form) {
               if (form.$valid) {
-                vm.calendar.$save();
-                // Refresh list instance
-                srcCalendar.init(vm.calendar.$omit());
-                $mdDialog.hide();
+                vm.calendar.$save().then(function() {
+                  // Refresh list instance
+                  srcCalendar.init(vm.calendar.$omit());
+                  $mdDialog.hide();
+                }, function() {
+                  form.$setPristine();
+                });
               }
             }