diff --git a/src/App.vue b/src/App.vue
index 112f7889..0c2a020a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,6 +13,7 @@
     }
 </script>
 
+
 <style>
     .q-field-icon,
     .q-item-icon {
diff --git a/src/api/subscriber.js b/src/api/subscriber.js
index 9ea7e03c..1a9ce94e 100644
--- a/src/api/subscriber.js
+++ b/src/api/subscriber.js
@@ -1,11 +1,12 @@
 
 import _ from 'lodash';
 import Vue from 'vue';
+import { getJsonBody } from './utils'
 
 export function getPreferences(id) {
     return new Promise((resolve, reject)=>{
         Vue.http.get('/api/subscriberpreferences/' + id).then((result)=>{
-            resolve(JSON.parse(result.body));
+            resolve(getJsonBody(result.body));
         }).catch((err)=>{
             reject(err);
         });
@@ -14,13 +15,14 @@ export function getPreferences(id) {
 
 export function setPreference(id, field, value) {
     return new Promise((resolve, reject)=>{
-        Promise.resolve().then(()=>{
-            return getPreferences(id);
-        }).then((result)=>{
-            var prefs = _.cloneDeep(result);
-            delete prefs._links;
-            prefs[field] = value;
-            return Vue.http.put('/api/subscriberpreferences/' + id, prefs);
+        var headers = {};
+        headers['Content-Type'] = 'application/json-patch+json';
+        Promise.resolve().then((result)=>{
+            return Vue.http.patch('/api/subscriberpreferences/' + id, [{
+                    op: 'replace',
+                    path: '/'+ field,
+                    value: value
+            }], { headers: headers });
         }).then(()=>{
             resolve();
         }).catch((err)=>{
diff --git a/src/api/utils.js b/src/api/utils.js
new file mode 100644
index 00000000..d2eaf7eb
--- /dev/null
+++ b/src/api/utils.js
@@ -0,0 +1,14 @@
+
+
+import _ from 'lodash';
+
+export function getJsonBody(body) {
+    if(_.isString(body)) {
+        try {
+            return JSON.parse(body);
+        } catch(err) {
+            return body;
+        }
+    }
+    return body;
+}
diff --git a/t/api/subscriber.js b/t/api/subscriber.js
new file mode 100644
index 00000000..5f4cccc3
--- /dev/null
+++ b/t/api/subscriber.js
@@ -0,0 +1,47 @@
+'use strict';
+
+import Vue from 'vue';
+import VueResource from 'vue-resource';
+import { getPreferences } from '../../src/api/subscriber';
+import { assert } from 'chai';
+
+Vue.use(VueResource);
+
+
+describe('Subscriber', function(){
+
+    it('should get all subscriber preferences', function(done) {
+        Vue.http.interceptors = [];
+        Vue.http.interceptors.unshift((request, next)=>{
+            next(request.respondWith(JSON.stringify({
+                block_in_mode: false
+            }), {
+                status: 200
+            }));
+        });
+        getPreferences('123').then((result)=>{
+            assert.property(result, 'block_in_mode');
+            assert.isFalse(result.block_in_mode);
+            done();
+        }).catch((err)=>{
+            done(err);
+        });
+    });
+
+    it('should handle a 403 Forbidden while requesting the preferences', function(done) {
+        Vue.http.interceptors = [];
+        Vue.http.interceptors.unshift((request, next)=>{
+            next(request.respondWith(JSON.stringify({
+                message: '403 Forbidden'
+            }), {
+                status: 403
+            }));
+        });
+        getPreferences('123').then(()=>{
+            done(new Error('Test failed'));
+        }).catch((err)=>{
+            assert.equal(err.status, 403);
+            done();
+        });
+    });
+});