diff --git a/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs b/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs
index 4043ee7feb31..d82873a11b9a 100644
--- a/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs
+++ b/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs
@@ -106,9 +106,9 @@ public class ConnectAzureRmAccountCommand : AzureContextModificationCmdlet, IMod
         public SwitchParameter ServicePrincipal { get; set; }
 
         [Parameter(ParameterSetName = UserParameterSet,
-                    Mandatory = false, HelpMessage = "Optional tenant name or ID")]
+                    Mandatory = true, HelpMessage = "Optional tenant name or ID")]
         [Parameter(ParameterSetName = UserWithCredentialParameterSet,
-                    Mandatory = false, HelpMessage = "Optional tenant name or ID")]
+                    Mandatory = true, HelpMessage = "Optional tenant name or ID")]
         [Parameter(ParameterSetName = ServicePrincipalParameterSet,
                     Mandatory = true, HelpMessage = "Tenant name or ID")]
         [Parameter(ParameterSetName = AccessTokenParameterSet,
@@ -120,7 +120,7 @@ public class ConnectAzureRmAccountCommand : AzureContextModificationCmdlet, IMod
         [Parameter(ParameterSetName = ClientAssertionParameterSet,
                     Mandatory = true, HelpMessage = "Tenant name or ID")]
         [Parameter(ParameterSetName = ManagedServiceParameterSet,
-                    Mandatory = false, HelpMessage = "Optional tenant name or ID")]
+                    Mandatory = true, HelpMessage = "Optional tenant name or ID")]
         [Alias("Domain", "TenantId")]
         [ValidateNotNullOrEmpty]
         public string Tenant { get; set; }
diff --git a/src/Accounts/Accounts/help/Connect-AzAccount.md b/src/Accounts/Accounts/help/Connect-AzAccount.md
index 6e837e54f0a0..b6f37bc8c739 100644
--- a/src/Accounts/Accounts/help/Connect-AzAccount.md
+++ b/src/Accounts/Accounts/help/Connect-AzAccount.md
@@ -3,7 +3,7 @@ external help file: Microsoft.Azure.PowerShell.Cmdlets.Accounts.dll-Help.xml
 Module Name: Az.Accounts
 online version: https://docs.microsoft.com/powershell/module/az.accounts/connect-azaccount
 schema: 2.0.0
----
+--- 
 
 # Connect-AzAccount