diff --git a/Registration/RegisterWithAzure.psm1 b/Registration/RegisterWithAzure.psm1
index 55e9645d..b0bc9c5f 100644
--- a/Registration/RegisterWithAzure.psm1
+++ b/Registration/RegisterWithAzure.psm1
@@ -188,7 +188,10 @@ function Set-AzsRegistration{
         [switch] $MarketplaceSyndicationEnabled = $true,
 
         [Parameter(Mandatory = $false)]
-        [switch] $UsageReportingEnabled = $true,
+        [switch] $UsageReportingEnabled = @{'Capacity'=$true; 
+                                            'PayAsYouUse'=$true; 
+                                            'Development'=$true; 
+                                            'Custom'=$false}[$BillingModel],
 
         [Parameter(Mandatory = $false)]
         [ValidateNotNull()]