diff --git a/src/model.js b/src/model.js
index 54c46cf0f2..cda4f7d044 100644
--- a/src/model.js
+++ b/src/model.js
@@ -702,7 +702,6 @@
             var succeed = function(values, exception) {
                 if (exception === undefined) exception = false;
                 var id2value = {};
-                var promises = [];
                 values.forEach(function(e, i, a) {
                     id2value[e.id] = e;
                 });
@@ -722,10 +721,9 @@
                             }
                             delete value[key];
                         }
-                        promises.push(record.set(value));
+                        record.set(value);
                     }
                 }
-                return jQuery.when.apply(jQuery, promises);
             }.bind(this);
             var failed = function() {
                 var failed_values = [];
diff --git a/src/window.js b/src/window.js
index 865dafda93..b2cf5e96d8 100644
--- a/src/window.js
+++ b/src/window.js
@@ -734,17 +734,14 @@
                 }.bind(this));
             };
             var set_preferences = function(preferences) {
-                var prm;
                 this.screen.current_record.cancel();
-                prm = this.screen.current_record.set(preferences);
+                this.screen.current_record.set(preferences);
                 this.screen.current_record.id =
                     this.screen.model.session.user_id;
-                prm.then(function() {
-                    this.screen.current_record.validate(null, true).then(
-                        function() {
-                            this.screen.display(true);
-                        }.bind(this));
-                }.bind(this));
+                this.screen.current_record.validate(null, true).then(
+                    function() {
+                        this.screen.display(true);
+                    }.bind(this));
                 dialog.body.append(this.screen.screen_container.el);
                 this.el.modal('show');
             };