diff --git a/client/src/session-storage.js b/client/src/session-storage.js
index 1c422f9a62..0e5254e7ca 100644
--- a/client/src/session-storage.js
+++ b/client/src/session-storage.js
@@ -56,7 +56,7 @@ define('session-storage', ['storage'], function (Dep) {
         },
 
         set: function (name, value) {
-            if (value instanceof Object || Array.isArray(value)) {
+            if (value instanceof Object || Array.isArray(value) || value === true || value === false) {
                 value = '__JSON__:' + JSON.stringify(value);
             }
             try {
@@ -66,6 +66,10 @@ define('session-storage', ['storage'], function (Dep) {
             }
         },
 
+        has: function (name) {
+            return this.storageObject.getItem(name) !== null;
+        },
+
         clear: function (name) {
             for (var i in this.storageObject) {
                 if (i === name) {
diff --git a/client/src/storage.js b/client/src/storage.js
index 803f5c8092..ee8fc4a978 100644
--- a/client/src/storage.js
+++ b/client/src/storage.js
@@ -96,7 +96,7 @@ define('storage', [], function () {
             this.checkType(type);
 
             var key = this.composeKey(type, name);
-            if (value instanceof Object || Array.isArray(value)) {
+            if (value instanceof Object || Array.isArray(value) || value === true || value === false) {
                 value = '__JSON__:' + JSON.stringify(value);
             }
             try {