diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml
index dfdbdaef4f..a2929bd299 100644
--- a/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml
@@ -42,7 +42,6 @@
                 Style="{DynamicResource GitHubH1TextBlock}"
                 IsHitTestVisible="False"
                 Text="{x:Static ghfvs:Resources.LoginLink}" />
-            
             <controls:HorizontalShadowDivider />
         </StackPanel>
         <TabControl 
@@ -83,38 +82,46 @@
                     </StackPanel>
 
                     <StackPanel x:Name="dotComloginControlsPanel">
-                        
-                        <StackPanel Style="{StaticResource FormFieldStackPanel}">
-                            <ghfvs:PromptTextBox
-                                x:Name="dotComUserNameOrEmail"
-                                PromptText="{x:Static ghfvs:Resources.UserNameOrEmailPromptText}"
-                                Margin="0,0,0,10" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomUsernameEmailTextBox}" />
 
-                            <ghfvs:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static ghfvs:Resources.PasswordPrompt}" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomPasswordTextBox}"/>
+                        <StackPanel Style="{StaticResource FormFieldStackPanel}">
 
-                            <Border Style="{StaticResource LoginButtonBorder}" Margin="0 16 0 0">
-                                <Button
-                                    x:Name="dotComLogInButton"
-                                    Content="{x:Static ghfvs:Resources.LoginLink}"
-                                    IsDefault="True"
-                                    Command=""
-                                    AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomSignInButton}" />
-                            </Border>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                <ghfvs:GitHubActionLink x:Name="dotComSsaLogInButton" Content="{x:Static ghfvs:Resources.SignInWithYourBrowser}"/>
+                                <ghfvs:OcticonImage Icon="link_external" Margin="0 1 0 0"/>
+                            </StackPanel>
 
-                            <Grid Margin="0 8">
-                              <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                              </Grid.ColumnDefinitions>
-                              <Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
-                              <TextBlock Grid.Column="1" Margin="8,0,8,4">or</TextBlock>
-                              <Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
-                            </Grid>
+                            <!--
+                                Signing with with username/password is going away, see:
+                                https://developer.github.com/changes/2020-02-14-deprecating-oauth-auth-endpoint/
+                                Setting Visibility="Collapsed"
+                            -->
+                            <StackPanel Name="dotComUsernamePasswordPanel" Visibility="Collapsed">
+                                <Grid Margin="0 8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
+                                    <TextBlock Grid.Column="1" Margin="8,0,8,4" Text="{x:Static ghfvs:Resources.orText}"/>
+                                    <Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
+                                </Grid>
 
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                              <ghfvs:GitHubActionLink x:Name="dotComSsaLogInButton" Content="{x:Static ghfvs:Resources.SignInWithYourBrowser}"/>
-                              <ghfvs:OcticonImage Icon="link_external" Margin="0 1 0 0"/>
+                                <ghfvs:PromptTextBox
+                                    x:Name="dotComUserNameOrEmail"
+                                    PromptText="{x:Static ghfvs:Resources.UserNameOrEmailPromptText}"
+                                    Margin="0,0,0,10" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomUsernameEmailTextBox}" />
+
+                                <ghfvs:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static ghfvs:Resources.PasswordPrompt}" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomPasswordTextBox}"/>
+
+                                <Border Style="{StaticResource LoginButtonBorder}" Margin="0 16 0 0">
+                                    <Button
+                                        x:Name="dotComLogInButton"
+                                        Content="{x:Static ghfvs:Resources.LoginLink}"
+                                        IsDefault="True"
+                                        Command=""
+                                        AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomSignInButton}" />
+                                </Border>
                             </StackPanel>
 
                             <ghfvs:UserErrorMessages x:Name="dotComErrorMessage" Margin="0,10">
@@ -127,7 +134,7 @@
                             <ghfvs:ValidationMessage
                                 x:Name="dotComPasswordValidationMessage"
                                 ValidatesControl="{Binding ElementName=dotComPassword}" />
-                         
+
                         </StackPanel>
                     </StackPanel>
                 </DockPanel>
@@ -140,7 +147,7 @@
                             <Hyperlink x:Name="learnMoreLink" ToolTip="enterprise.github.com"><TextBlock Text="{x:Static ghfvs:Resources.learnMoreLink}" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.EnterpriseLearnMoreHyperlink}"></TextBlock></Hyperlink>
                         </TextBlock>
                     </StackPanel>
-                    
+
                     <StackPanel
                         x:Name="enterpriseloginControlsPanel"
                         Style="{StaticResource FormFieldStackPanel}">
@@ -149,31 +156,60 @@
                                           PromptText="{x:Static ghfvs:Resources.enterpriseUrlPromptText}"
                                           Margin="0,0,0,10"
                                           AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.EnterpriseServerAddressTextBox}">
-                          <ghfvs:PromptTextBox.IconContentTemplate>
-                            <DataTemplate DataType="{x:Type ghfvs:EnterpriseProbeStatus}">
-                                <Grid Margin="4,0">
-                                  <ghfvs:Spinner Margin="0,4" Visibility="{Binding Converter={ghfvs:EqualsToVisibilityConverter Checking}}"/>
-                                  <ghfvs:OcticonImage Icon="check" Visibility="{Binding Converter={ghfvs:EqualsToVisibilityConverter Valid}}"/>
-                                  <ghfvs:OcticonImage Icon="x" Visibility="{Binding Converter={ghfvs:EqualsToVisibilityConverter Invalid}}"/>
-                                </Grid>
-                            </DataTemplate>
-                          </ghfvs:PromptTextBox.IconContentTemplate>
+                            <ghfvs:PromptTextBox.IconContentTemplate>
+                                <DataTemplate DataType="{x:Type ghfvs:EnterpriseProbeStatus}">
+                                    <Grid Margin="4,0">
+                                        <ghfvs:Spinner Margin="0,4" Visibility="{Binding Converter={ghfvs:EqualsToVisibilityConverter Checking}}"/>
+                                        <ghfvs:OcticonImage Icon="check" Visibility="{Binding Converter={ghfvs:EqualsToVisibilityConverter Valid}}"/>
+                                        <ghfvs:OcticonImage Icon="x" Visibility="{Binding Converter={ghfvs:EqualsToVisibilityConverter Invalid}}"/>
+                                    </Grid>
+                                </DataTemplate>
+                            </ghfvs:PromptTextBox.IconContentTemplate>
                         </ghfvs:PromptTextBox>
 
+                        <StackPanel Name="enterpriseSsoPanel">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                <ghfvs:GitHubActionLink x:Name="enterpriseSsaLogInButton" Content="{x:Static ghfvs:Resources.SignInWithYourBrowser}"/>
+                                <ghfvs:OcticonImage Icon="link_external" Margin="0 1 0 0"/>
+                            </StackPanel>
+                        </StackPanel>
+
                         <StackPanel Name="enterpriseUsernamePasswordPanel">
-                          <ghfvs:PromptTextBox
+                            <Grid Margin="0 8">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
+                                <TextBlock Grid.Column="1" Margin="8,0,8,4" Text="{x:Static ghfvs:Resources.orText}"/>
+                                <Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
+                            </Grid>
+
+                            <ghfvs:PromptTextBox
                               x:Name="enterpriseUserNameOrEmail"
                               PromptText="{x:Static ghfvs:Resources.UserNameOrEmailPromptText}"
                               Margin="0,0,0,10" 
                               AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.EnterpriseUsernameEmailTextBox}" />
 
-                          <ghfvs:SecurePasswordBox x:Name="enterprisePassword"
+                            <ghfvs:SecurePasswordBox x:Name="enterprisePassword"
                                                 PromptText="{x:Static ghfvs:Resources.PasswordPrompt}"
                                                 AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.EnterprisePasswordTextBox}" />
                         </StackPanel>
 
                         <StackPanel Name="enterpriseTokenPanel">
-                          <ghfvs:SecurePasswordBox x:Name="enterpriseToken"
+                            <Grid Margin="0 8">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
+                                <TextBlock Grid.Column="1" Margin="8,0,8,4" Text="{x:Static ghfvs:Resources.orText}"/>
+                                <Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
+                            </Grid>
+
+                            <ghfvs:SecurePasswordBox x:Name="enterpriseToken"
                                                 PromptText="{x:Static ghfvs:Resources.TokenPrompt}"
                                                 AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.EnterprisePasswordTextBox}" />
                         </StackPanel>
@@ -185,23 +221,6 @@
                                 IsDefault="True" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.EnterpriseSignInButton}"/>
                         </Border>
 
-                        <StackPanel Name="enterpriseSsoPanel">
-                          <Grid Margin="0 8">
-                            <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="*"/>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
-                            <TextBlock Grid.Column="1" Margin="8,0,8,4" Text="{x:Static ghfvs:Resources.orText}"/>
-                            <Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
-                          </Grid>
-                          <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                            <ghfvs:GitHubActionLink x:Name="enterpriseSsaLogInButton" Content="{x:Static ghfvs:Resources.SignInWithYourBrowser}"/>
-                            <ghfvs:OcticonImage Icon="link_external" Margin="0 1 0 0"/>
-                          </StackPanel>
-                        </StackPanel>
-
                         <ghfvs:ValidationMessage
                             x:Name="enterpriseUserNameOrEmailValidationMessage"
                             ValidatesControl="{Binding ElementName=enterpriseUserNameOrEmail}"/>
diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml.cs
index 511a0b75c0..65c6cdf547 100644
--- a/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml.cs
+++ b/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml.cs
@@ -95,6 +95,7 @@ void SetupEnterpriseBindings(Action<IDisposable> d)
             d(this.OneWayBind(ViewModel, vm => vm.EnterpriseLogin.SupportedLoginMethods, x => x.enterpriseUsernamePasswordPanel.Visibility, x => x.HasValue && ((x & EnterpriseLoginMethods.UsernameAndPassword) != 0) ? Visibility.Visible : Visibility.Collapsed));
             d(this.OneWayBind(ViewModel, vm => vm.EnterpriseLogin.SupportedLoginMethods, x => x.enterpriseTokenPanel.Visibility, x => x.HasValue && ((x & EnterpriseLoginMethods.Token) != 0) ? Visibility.Visible : Visibility.Collapsed));
             d(this.OneWayBind(ViewModel, vm => vm.EnterpriseLogin.SupportedLoginMethods, x => x.enterpriseSsoPanel.Visibility, x => x.HasValue && ((x & EnterpriseLoginMethods.OAuth) != 0) ? Visibility.Visible : Visibility.Collapsed));
+            d(this.OneWayBind(ViewModel, vm => vm.EnterpriseLogin.SupportedLoginMethods, x => x.enterpriseLogInButton.Visibility, x => x.HasValue && ((x & (EnterpriseLoginMethods.UsernameAndPassword | EnterpriseLoginMethods.Token)) != 0) ? Visibility.Visible : Visibility.Collapsed));
 
             d(this.Bind(ViewModel, vm => vm.EnterpriseLogin.UsernameOrEmail, x => x.enterpriseUserNameOrEmail.Text));
             d(this.OneWayBind(ViewModel, vm => vm.EnterpriseLogin.UsernameOrEmailValidator, v => v.enterpriseUserNameOrEmailValidationMessage.ReactiveValidator));