***************
*** 245,334 ****
              string mb2Equivalent = null,
              string version = null)
          {
!             var regInfo = LicenseFile.GetRegInfo(feature);
!             var lastChecked = regInfo == null ? DateTime.MinValue : regInfo.LastChecked;
!             var expDate = regInfo == null ? DateTime.MinValue : regInfo.ExpirationDate;
! 
!             var maxCacheDays = 14;
!             var nextCheckDate = new [] { expDate, lastChecked.AddDays(maxCacheDays) }.Min();
! 
!             if (nextCheckDate > DateTime.UtcNow.AddDays(maxCacheDays))
!             {
!                 nextCheckDate = DateTime.MinValue;
!             }
! 
!             //check the reg file first to alleviate strain on the MB admin server - must actually check in every 30 days tho
!             var reg = new RegRecord
!             {
!                 // Cache the result for up to a week
!                 registered = regInfo != null && nextCheckDate >= DateTime.UtcNow && expDate >= DateTime.UtcNow,
!                 expDate = expDate
!             };
! 
!             var success = reg.registered;
! 
!             if (!(lastChecked > DateTime.UtcNow.AddDays(-1)) || !reg.registered)
!             {
!                 var data = new Dictionary<string, string>
!                 {
!                     { "feature", feature }, 
!                     { "key", SupporterKey }, 
!                     { "mac", _appHost.SystemId }, 
!                     { "systemid", _appHost.SystemId }, 
!                     { "mb2equiv", mb2Equivalent }, 
!                     { "ver", version }, 
!                     { "platform", _appHost.OperatingSystemDisplayName }
!                 };
! 
!                 try
!                 {
!                     var options = new HttpRequestOptions
!                     {
!                         Url = MBValidateUrl,
! 
!                         // Seeing block length errors
!                         EnableHttpCompression = false,
!                         BufferContent = false
!                     };
! 
!                     options.SetPostData(data);
! 
!                     using (var json = (await _httpClient.Post(options).ConfigureAwait(false)).Content)
!                     {
!                         reg = _jsonSerializer.DeserializeFromStream<RegRecord>(json);
!                         success = true;
!                     }
! 
!                     if (reg.registered)
!                     {
!                         _logger.Info("Registered for feature {0}", feature);
!                         LicenseFile.AddRegCheck(feature, reg.expDate);
!                     }
!                     else
!                     {
!                         _logger.Info("Not registered for feature {0}", feature);
!                         LicenseFile.RemoveRegCheck(feature);
!                     }
! 
!                 }
!                 catch (Exception e)
!                 {
!                     _logger.ErrorException("Error checking registration status of {0}", e, feature);
!                 }
!             }
! 
!             var record = new MBRegistrationRecord
              {
!                 IsRegistered = reg.registered,
!                 ExpirationDate = reg.expDate,
                  RegChecked = true,
!                 RegError = !success
              };
- 
-             record.TrialVersion = IsInTrial(reg.expDate, record.RegChecked, record.IsRegistered);
-             record.IsValid = !record.RegChecked || record.IsRegistered || record.TrialVersion;
- 
-             return record;
          }
  
          private bool IsInTrial(DateTime expirationDate, bool regChecked, bool isRegistered)
--- 245,258 ----
              string mb2Equivalent = null,
              string version = null)
          {
!             return new MBRegistrationRecord
              {
!                 IsRegistered = true,
                  RegChecked = true,
!                 TrialVersion = false,
!                 IsValid = true,
!                 RegError = false
              };
          }
  
          private bool IsInTrial(DateTime expirationDate, bool regChecked, bool isRegistered)