diff --git a/lnbits/static/js/base.js b/lnbits/static/js/base.js
index 729e09382..bb65a8245 100644
--- a/lnbits/static/js/base.js
+++ b/lnbits/static/js/base.js
@@ -135,7 +135,7 @@ window.LNbits = {
       return obj
     },
     user: function (data) {
-      var obj = _.object(['id', 'email', 'extensions', 'wallets'], data)
+      var obj = {id: data.id, email: data.email, extensions: data.extensions, wallets: data.wallets}
       var mapWallet = this.wallet
       obj.wallets = obj.wallets
         .map(function (obj) {
@@ -153,15 +153,12 @@ window.LNbits = {
       return obj
     },
     wallet: function (data) {
-      var obj = _.object(
-        ['id', 'name', 'user', 'adminkey', 'inkey', 'balance'],
-        data
-      )
-      obj.msat = obj.balance
-      obj.sat = Math.round(obj.balance / 1000)
-      obj.fsat = new Intl.NumberFormat(window.LOCALE).format(obj.sat)
-      obj.url = ['/wallet?usr=', obj.user, '&wal=', obj.id].join('')
-      return obj
+      newWallet = {id: data.id, name: data.name, adminkey: data.adminkey, inkey: data.inkey} 
+      newWallet.msat = data.balance_msat
+      newWallet.sat = Math.round(data.balance_msat / 1000)
+      newWallet.fsat = new Intl.NumberFormat(window.LOCALE).format(newWallet.sat)
+      newWallet.url = ['/wallet?usr=', data.user, '&wal=', data.id].join('')
+      return newWallet
     },
     payment: function (data) {
       var obj = _.object(