diff --git a/BillingService/Program.cs b/BillingService/Program.cs
index c842f44..6a333e5 100644
--- a/BillingService/Program.cs
+++ b/BillingService/Program.cs
@@ -94,7 +94,7 @@ namespace Teknik.BillingService
                     if (emailPrice != null)
                     {
                         UserHelper.EnableUserEmail(config, email);
-                        UserHelper.EditUserEmailMaxSize(config, email, (int)emailPrice.Storage);
+                        UserHelper.EditUserEmailMaxSize(config, email, emailPrice.Storage);
                     }
                 }
                 else
diff --git a/MailService/HMailService.cs b/MailService/HMailService.cs
index 1ca513a..fc2b521 100644
--- a/MailService/HMailService.cs
+++ b/MailService/HMailService.cs
@@ -35,14 +35,14 @@ namespace Teknik.MailService
             _App = InitApp();
         }
 
-        public void CreateAccount(string username, string password, int size)
+        public void CreateAccount(string username, string password, long size)
         {
             var domain = _App.Domains.ItemByName[_Domain];
             var newAccount = domain.Accounts.Add();
             newAccount.Address = username;
             newAccount.Password = password;
             newAccount.Active = true;
-            newAccount.MaxSize = size;
+            newAccount.MaxSize = (int)(size / 1000000);
 
             newAccount.Save();
         }
@@ -94,10 +94,10 @@ namespace Teknik.MailService
             mySQL.Execute(sql, new object[] { maxPerDay, username });
         }
 
-        public void EditMaxSize(string username, int size)
+        public void EditMaxSize(string username, long size)
         {
             var account = GetAccount(username);
-            account.MaxSize = size;
+            account.MaxSize = (int)(size / 1000000);
             account.Save();
         }
 
diff --git a/MailService/IMailService.cs b/MailService/IMailService.cs
index 9ea63a3..f285c26 100644
--- a/MailService/IMailService.cs
+++ b/MailService/IMailService.cs
@@ -10,11 +10,11 @@ namespace Teknik.MailService
 
         bool Enabled(string username);
 
-        void CreateAccount(string username, string password, int size);
+        void CreateAccount(string username, string password, long size);
 
         void EditPassword(string username, string password);
 
-        void EditMaxSize(string username, int size);
+        void EditMaxSize(string username, long size);
 
         void EditMaxEmailsPerDay(string username, int maxPerDay);
 
diff --git a/Teknik/Areas/Billing/BillingHelper.cs b/Teknik/Areas/Billing/BillingHelper.cs
index 956f899..6e3cdbe 100644
--- a/Teknik/Areas/Billing/BillingHelper.cs
+++ b/Teknik/Areas/Billing/BillingHelper.cs
@@ -44,7 +44,7 @@ namespace Teknik.Areas.Billing
                 if (active)
                 {
                     UserHelper.EnableUserEmail(config, email);
-                    UserHelper.EditUserEmailMaxSize(config, email, (int)price.Storage);
+                    UserHelper.EditUserEmailMaxSize(config, email, price.Storage);
                 }
                 else
                 {
diff --git a/Teknik/Areas/Billing/Controllers/BillingController.cs b/Teknik/Areas/Billing/Controllers/BillingController.cs
index e0e3a25..81c0697 100644
--- a/Teknik/Areas/Billing/Controllers/BillingController.cs
+++ b/Teknik/Areas/Billing/Controllers/BillingController.cs
@@ -34,6 +34,8 @@ namespace Teknik.Areas.Billing.Controllers
         [AllowAnonymous]
         public IActionResult ViewSubscriptions()
         {
+            ViewBag.Title = "Subscriptions";
+
             var subVM = new SubscriptionsViewModel();
 
             // Get Biling Service
diff --git a/Teknik/Areas/User/Controllers/UserController.cs b/Teknik/Areas/User/Controllers/UserController.cs
index ef38ff8..4417e51 100644
--- a/Teknik/Areas/User/Controllers/UserController.cs
+++ b/Teknik/Areas/User/Controllers/UserController.cs
@@ -580,6 +580,10 @@ namespace Teknik.Areas.Users.Controllers
                 model.Page = "Upload";
                 model.UserID = user.UserId;
                 model.Username = user.Username;
+
+                model.MaxStorage = user.UploadSettings.MaxUploadStorage ?? _config.UploadConfig.MaxStorage;
+                model.MaxFileSize = user.UploadSettings.MaxUploadFileSize ?? _config.UploadConfig.MaxUploadFileSize;
+
                 model.Encrypt = user.UploadSettings.Encrypt;
                 model.ExpirationLength = user.UploadSettings.ExpirationLength;
                 model.ExpirationUnit = user.UploadSettings.ExpirationUnit;
diff --git a/Teknik/Areas/User/Utility/UserHelper.cs b/Teknik/Areas/User/Utility/UserHelper.cs
index 2056f9e..3b57aa8 100644
--- a/Teknik/Areas/User/Utility/UserHelper.cs
+++ b/Teknik/Areas/User/Utility/UserHelper.cs
@@ -751,7 +751,7 @@ If you recieved this email and you did not reset your password, you can ignore t
             }
         }
 
-        public static void EditUserEmailMaxSize(Config config, string email, int size)
+        public static void EditUserEmailMaxSize(Config config, string email, long size)
         {
             try
             {
diff --git a/Teknik/Areas/User/ViewModels/UploadSettingsViewModel.cs b/Teknik/Areas/User/ViewModels/UploadSettingsViewModel.cs
index e5f18ae..78e5c30 100644
--- a/Teknik/Areas/User/ViewModels/UploadSettingsViewModel.cs
+++ b/Teknik/Areas/User/ViewModels/UploadSettingsViewModel.cs
@@ -10,6 +10,9 @@ namespace Teknik.Areas.Users.ViewModels
 {
     public class UploadSettingsViewModel : SettingsViewModel
     {
+        public long MaxStorage { get; set; }
+        public long MaxFileSize { get; set; }
+
         public bool Encrypt { get; set; }
         public int ExpirationLength { get; set; }
         public ExpirationUnit ExpirationUnit { get; set; }
diff --git a/Teknik/Areas/User/Views/User/Settings/UploadSettings.cshtml b/Teknik/Areas/User/Views/User/Settings/UploadSettings.cshtml
index 8aa2961..d39075f 100644
--- a/Teknik/Areas/User/Views/User/Settings/UploadSettings.cshtml
+++ b/Teknik/Areas/User/Views/User/Settings/UploadSettings.cshtml
@@ -12,6 +12,22 @@
 
 <bundle src="css/user.settings.upload.min.css" append-version="true"></bundle>
 
+<div class="row">
+    <div class="col-md-12">
+        <h3 class="text-center">Upload Limits</h3>
+        <div class="row">
+            <div class="col-md-2 col-sm-offset-1"><strong>Storage</strong></div>
+            <div class="col-md-9"><strong>@StringHelper.GetBytesReadable(Model.MaxStorage)</strong></div>
+        </div>
+        <div class="row">
+            <div class="col-md-2 col-sm-offset-1"><strong>File Size</strong></div>
+            <div class="col-md-9"><strong>@StringHelper.GetBytesReadable(Model.MaxFileSize)</strong></div>
+        </div>
+    </div>
+</div>
+<br />
+<hr />
+
 <!form class="form" action="##" method="post" id="updateForm">
 
     <div class="row form-horizontal">