diff --git a/routes/api/all.js b/routes/api/all.js
index 809ab13..8fb0325 100644
--- a/routes/api/all.js
+++ b/routes/api/all.js
@@ -40,8 +40,10 @@ module.exports = {
           res.locals.avatar = result[0].User_Avatar || ""
           res.locals.publicKey = result[0].User_PublicKey || ""
           res.locals.privateKey = result[0].User_PrivateKey || ""
-          res.locals.settings = result[0].User_Settings || {}
+          res.locals.settings = JSON.parse(result[0].User_Settings)
+          if(res.locals.settings == "null")res.locals.settings = {}
           if(res.locals.settings == null)res.locals.settings = {}
+
           next()
         } else {
           res.status(400)
diff --git a/routes/api/settingshandler.js b/routes/api/settingshandler.js
index b78dadf..0e39ef7 100644
--- a/routes/api/settingshandler.js
+++ b/routes/api/settingshandler.js
@@ -42,7 +42,7 @@ module.exports = {
             console.log(5,"changing settings", setting_to_change, setting_new_value, res.locals.settings)
 
             let sql = "update ipost.users set User_Settings=? where User_Name=?"
-            let values = [res.locals.settings,res.locals.username]
+            let values = [JSON.stringify(res.locals.settings),res.locals.username]
             con.query(sql, values, function (err, result) {
                 if(err) {
                     res.json({"status":"error","code":err})
@@ -52,4 +52,4 @@ module.exports = {
             })
         })
     }
-}
\ No newline at end of file
+}