diff --git a/src/App/Pages/Accounts/TwoFactorPage.xaml b/src/App/Pages/Accounts/TwoFactorPage.xaml
index 15fd72aec..fe1f7d471 100644
--- a/src/App/Pages/Accounts/TwoFactorPage.xaml
+++ b/src/App/Pages/Accounts/TwoFactorPage.xaml
@@ -17,13 +17,11 @@
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
             <u:IsNullConverter x:Key="isNull" />
+            <ToolbarItem Text="{u:I18n Continue}" Clicked="Continue_Clicked"
+                         x:Name="_continueItem" x:Key="continueItem" />
         </ResourceDictionary>
     </ContentPage.Resources>
 
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Continue}" Clicked="Continue_Clicked" x:Name="_continueItem" />
-    </ContentPage.ToolbarItems>
-
     <ScrollView x:Name="_scrollView">
         <StackLayout Spacing="10" Padding="0, 0, 0, 10" VerticalOptions="FillAndExpand">
             <StackLayout Spacing="20" Padding="0" IsVisible="{Binding TotpMethod, Mode=OneWay}">
@@ -108,7 +106,7 @@
                 IsVisible="{Binding SelectedProviderType, Mode=OneWay, Converter={StaticResource isNull}}">
                 <Label
                     Text="{u:I18n NoTwoStepAvailable}"
-                    Margin="10, 20, 10, 0"
+                    Margin="10, 20, 10, 10"
                     HorizontalTextAlignment="Center" />
             </StackLayout>
             <Button Text="{u:I18n UseAnotherTwoStepMethod}"
diff --git a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
index 754392e0e..ce072a95d 100644
--- a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
+++ b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
@@ -19,6 +19,21 @@ namespace Bit.App.Pages
 
         public HybridWebView DuoWebView { get; set; }
 
+        public void AddContinueButton()
+        {
+            if(ToolbarItems.Count == 0)
+            {
+                ToolbarItems.Add(_continueItem);
+            }
+        }
+
+        public void RemoveContinueButton()
+        {
+            if(ToolbarItems.Count > 0)
+            {
+                ToolbarItems.Remove(_continueItem);
+            }
+        }
         protected async override void OnAppearing()
         {
             base.OnAppearing();
diff --git a/src/App/Pages/Accounts/TwoFactorPageViewModel.cs b/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
index f2fb508e1..cfed16d58 100644
--- a/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
+++ b/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
@@ -114,6 +114,7 @@ namespace Bit.App.Pages
                 PageTitle = AppResources.LoginUnavailable;
                 return;
             }
+            var page = Page as TwoFactorPage;
             PageTitle = _authService.TwoFactorProviders[SelectedProviderType.Value].Name;
             var providerData = _authService.TwoFactorProvidersData[SelectedProviderType.Value];
             switch(SelectedProviderType.Value)
@@ -123,9 +124,9 @@ namespace Bit.App.Pages
                     break;
                 case TwoFactorProviderType.Duo:
                 case TwoFactorProviderType.OrganizationDuo:
+                    page.RemoveContinueButton();
                     var host = WebUtility.UrlEncode(providerData["Host"] as string);
                     var req = WebUtility.UrlEncode(providerData["Signature"] as string);
-                    var page = Page as TwoFactorPage;
                     page.DuoWebView.Uri = $"{_webVaultUrl}/duo-connector.html?host={host}&request={req}";
                     page.DuoWebView.RegisterAction(async sig =>
                     {
@@ -134,6 +135,7 @@ namespace Bit.App.Pages
                     });
                     break;
                 case TwoFactorProviderType.Email:
+                    page.AddContinueButton();
                     TwoFactorEmail = providerData["Email"] as string;
                     if(_authService.TwoFactorProvidersData.Count > 1)
                     {
@@ -141,6 +143,7 @@ namespace Bit.App.Pages
                     }
                     break;
                 default:
+                    page.AddContinueButton();
                     break;
             }
         }