diff --git a/libs/startup.js b/libs/startup.js
index 3c589562..cdc1fa83 100644
--- a/libs/startup.js
+++ b/libs/startup.js
@@ -74,8 +74,6 @@ module.exports = function(s,config,lang,io){
     var loadDiskUseForUser = function(user,callback){
         s.systemLog(user.mail+' : '+lang.startUpText0)
         var userDetails = JSON.parse(user.details)
-        user.size = 0
-        user.limit = userDetails.size
         s.sqlQuery('SELECT * FROM Videos WHERE ke=? AND status!=?',[user.ke,0],function(err,videos){
             s.sqlQuery('SELECT * FROM `Timelapse Frames` WHERE ke=?',[user.ke],function(err,timelapseFrames){
                 s.sqlQuery('SELECT * FROM `Files` WHERE ke=?',[user.ke],function(err,files){
diff --git a/libs/user.js b/libs/user.js
index 02a38d24..7b18ef6f 100644
--- a/libs/user.js
+++ b/libs/user.js
@@ -267,7 +267,7 @@ module.exports = function(s,config){
         if(!s.group[e.ke].addStorageUse){s.group[e.ke].addStorageUse = {}}
         if(!e.limit||e.limit===''){e.limit=10000}else{e.limit=parseFloat(e.limit)}
         //save global space limit for group key (mb)
-        s.group[e.ke].sizeLimit = s.group[e.ke].sizeLimit || e.limit || 10000
+        s.group[e.ke].sizeLimit = e.limit || s.group[e.ke].sizeLimit || 10000
         //save global used space as megabyte value
         s.group[e.ke].usedSpace = s.group[e.ke].usedSpace || ((e.size || 0) / 1000000)
         //emit the changes to connected users