diff --git a/BillingService/Program.cs b/BillingService/Program.cs
index d7d92ab..61b8bbb 100644
--- a/BillingService/Program.cs
+++ b/BillingService/Program.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
 using CommandLine;
 using Microsoft.EntityFrameworkCore;
 using Teknik.Areas.Billing;
@@ -72,7 +73,7 @@ namespace Teknik.BillingService
             return -1;
         }
 
-        public static void SyncSubscriptions(Config config, TeknikEntities db)
+        public static async Task SyncSubscriptions(Config config, TeknikEntities db)
         {
             // Get Biling Service
             var billingService = BillingFactory.GetBillingService(config.BillingConfig);
@@ -117,7 +118,13 @@ namespace Teknik.BillingService
                     }
                     else
                     {
-                        BillingHelper.SetEmailLimits(config, user, config.EmailConfig.MaxSize, false);
+                        // Only reset their email size limit if they are premium
+                        var userInfo = await IdentityHelper.GetIdentityUserInfo(config, user.Username);
+                        if (userInfo != null &&
+                            userInfo.AccountType == AccountType.Premium)
+                            BillingHelper.SetEmailLimits(config, user, config.EmailConfig.MaxSize, true);
+                        else
+                            BillingHelper.SetEmailLimits(config, user, config.EmailConfig.MaxSize, false);
                     }
                 }
             }
diff --git a/IdentityServer/package.json b/IdentityServer/package.json
index d4201e8..c3e8965 100644
--- a/IdentityServer/package.json
+++ b/IdentityServer/package.json
@@ -35,8 +35,8 @@
         "url": "https://git.teknik.io/Teknikode/Teknik"
     },
     "scripts": {
-        "pre-publish": "npm install && gulp clean && gulp copy-assets && gulp watch",
-        "build": "npm install && gulp clean && gulp copy-assets && gulp min && gulp update-version",
+        "pre-publish": "npm install && gulp clean && gulp copy-assets",
+        "build": "npm install && gulp eslint && gulp clean && gulp copy-assets && gulp load-bundle && gulp min && gulp update-version",
         "gulp": "gulp"
     },
     "version": "2.1.0"
diff --git a/Teknik/package.json b/Teknik/package.json
index a2fab22..9d7cff9 100644
--- a/Teknik/package.json
+++ b/Teknik/package.json
@@ -57,8 +57,8 @@
         "url": "https://git.teknik.io/Teknikode/Teknik"
     },
     "scripts": {
-        "pre-publish": "npm install && gulp clean && gulp copy-assets && gulp watch",
-        "build": "npm install && gulp eslint && gulp clean && gulp copy-assets && gulp min && gulp update-version",
+        "pre-publish": "npm install && gulp clean && gulp copy-assets",
+        "build": "npm install && gulp eslint && gulp clean && gulp copy-assets && gulp load-bundle && gulp min && gulp update-version",
         "gulp": "gulp"
     },
     "version": "2.1.0"