diff --git a/Wino.Core.Domain/Interfaces/IDialogServiceBase.cs b/Wino.Core.Domain/Interfaces/IDialogServiceBase.cs
index cb86603e..42789f42 100644
--- a/Wino.Core.Domain/Interfaces/IDialogServiceBase.cs
+++ b/Wino.Core.Domain/Interfaces/IDialogServiceBase.cs
@@ -27,7 +27,7 @@ namespace Wino.Core.Domain.Interfaces
                                             string dontAskAgainConfigurationKey = "");
         Task<bool> ShowCustomThemeBuilderDialogAsync();
         Task<AccountCreationDialogResult> ShowAccountProviderSelectionDialogAsync(List<IProviderDetail> availableProviders);
-        IAccountCreationDialog GetAccountCreationDialog(MailProviderType type);
+        IAccountCreationDialog GetAccountCreationDialog(AccountCreationDialogResult accountCreationDialogResult);
         Task<List<SharedFile>> PickFilesAsync(params object[] typeFilters);
         Task<string> PickFilePathAsync(string saveFileName);
     }
diff --git a/Wino.Core.Domain/Interfaces/ICustomServerAccountCreationDialog.cs b/Wino.Core.Domain/Interfaces/IImapAccountCreationDialog.cs
similarity index 90%
rename from Wino.Core.Domain/Interfaces/ICustomServerAccountCreationDialog.cs
rename to Wino.Core.Domain/Interfaces/IImapAccountCreationDialog.cs
index 2bc7f19f..9230aec0 100644
--- a/Wino.Core.Domain/Interfaces/ICustomServerAccountCreationDialog.cs
+++ b/Wino.Core.Domain/Interfaces/IImapAccountCreationDialog.cs
@@ -3,7 +3,7 @@ using Wino.Core.Domain.Entities.Shared;
 
 namespace Wino.Core.Domain.Interfaces
 {
-    public interface ICustomServerAccountCreationDialog : IAccountCreationDialog
+    public interface IImapAccountCreationDialog : IAccountCreationDialog
     {
         /// <summary>
         /// Returns the custom server information from the dialog..
diff --git a/Wino.Core.Domain/Interfaces/ISpecialImapProviderConfigResolver.cs b/Wino.Core.Domain/Interfaces/ISpecialImapProviderConfigResolver.cs
new file mode 100644
index 00000000..34c35dbe
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/ISpecialImapProviderConfigResolver.cs
@@ -0,0 +1,10 @@
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Models.Accounts;
+
+namespace Wino.Core.Domain.Interfaces
+{
+    public interface ISpecialImapProviderConfigResolver
+    {
+        CustomServerInformation GetServerInformation(MailAccount account, AccountCreationDialogResult dialogResult);
+    }
+}
diff --git a/Wino.Core.Domain/Models/Accounts/AccountCreationDialogResult.cs b/Wino.Core.Domain/Models/Accounts/AccountCreationDialogResult.cs
index 428d1307..961a0d1a 100644
--- a/Wino.Core.Domain/Models/Accounts/AccountCreationDialogResult.cs
+++ b/Wino.Core.Domain/Models/Accounts/AccountCreationDialogResult.cs
@@ -2,5 +2,5 @@
 
 namespace Wino.Core.Domain.Models.Accounts
 {
-    public record AccountCreationDialogResult(MailProviderType ProviderType, string AccountName, string AccountColorHex = "");
+    public record AccountCreationDialogResult(MailProviderType ProviderType, string AccountName, SpecialImapProviderDetails SpecialImapProviderDetails);
 }
diff --git a/Wino.Core.Domain/Models/Accounts/SpecialImapProviderDetails.cs b/Wino.Core.Domain/Models/Accounts/SpecialImapProviderDetails.cs
new file mode 100644
index 00000000..5f3b489c
--- /dev/null
+++ b/Wino.Core.Domain/Models/Accounts/SpecialImapProviderDetails.cs
@@ -0,0 +1,6 @@
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Accounts
+{
+    public record SpecialImapProviderDetails(string Address, string Password, string SenderName, SpecialImapProvider SpecialImapProvider);
+}
diff --git a/Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml b/Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml
new file mode 100644
index 00000000..ae38dd73
--- /dev/null
+++ b/Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml
@@ -0,0 +1,132 @@
+<UserControl
+    x:Class="Wino.Core.UWP.Controls.AccountCreationDialogControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:local="using:Wino.Core.UWP.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    d:DesignHeight="300"
+    d:DesignWidth="400"
+    Loaded="ControlLoaded"
+    Unloaded="ControlUnloaded"
+    mc:Ignorable="d">
+
+    <Grid x:Name="RootGrid" RowSpacing="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <Viewbox Width="24">
+            <PathIcon x:Name="DialogIcon" Data="F1 M 5 4.902344 C 5 4.225262 5.135091 3.588867 5.405273 2.993164 C 5.675456 2.397461 6.040039 1.878256 6.499023 1.435547 C 6.958008 0.99284 7.488606 0.642904 8.09082 0.385742 C 8.693033 0.128582 9.329427 0 10 0 C 10.690104 0 11.339518 0.130209 11.948242 0.390625 C 12.556965 0.651043 13.087564 1.007488 13.540039 1.459961 C 13.992513 1.912436 14.348958 2.443035 14.609375 3.051758 C 14.869791 3.660482 14.999999 4.309896 15 5 C 14.999999 5.690104 14.869791 6.339519 14.609375 6.948242 C 14.348958 7.556967 13.992513 8.087565 13.540039 8.540039 C 13.087564 8.992514 12.556965 9.348959 11.948242 9.609375 C 11.339518 9.869792 10.690104 10 10 10 C 9.290364 10 8.631185 9.866537 8.022461 9.599609 C 7.413737 9.332683 6.884766 8.9681 6.435547 8.505859 C 5.986328 8.043621 5.634766 7.503256 5.380859 6.884766 C 5.126953 6.266276 5 5.605469 5 4.902344 Z M 13.75 4.921875 C 13.75 4.414062 13.649088 3.937176 13.447266 3.491211 C 13.245442 3.045248 12.973633 2.65625 12.631836 2.324219 C 12.290039 1.992188 11.891275 1.730145 11.435547 1.538086 C 10.979817 1.346029 10.501302 1.25 10 1.25 C 9.479166 1.25 8.990885 1.347656 8.535156 1.542969 C 8.079427 1.738281 7.682291 2.005209 7.34375 2.34375 C 7.005208 2.682293 6.738281 3.079428 6.542969 3.535156 C 6.347656 3.990887 6.25 4.479167 6.25 5 C 6.25 5.520834 6.347656 6.009115 6.542969 6.464844 C 6.738281 6.920573 7.005208 7.317709 7.34375 7.65625 C 7.682291 7.994792 8.079427 8.261719 8.535156 8.457031 C 8.990885 8.652344 9.479166 8.75 10 8.75 C 10.533854 8.75 11.030273 8.650717 11.489258 8.452148 C 11.948242 8.253581 12.345377 7.980144 12.680664 7.631836 C 13.015949 7.283529 13.277994 6.876629 13.466797 6.411133 C 13.655599 5.945639 13.75 5.449219 13.75 4.921875 Z M 1.25 13.75 C 1.25 13.417969 1.315104 13.100586 1.445312 12.797852 C 1.575521 12.495117 1.751302 12.229818 1.972656 12.001953 C 2.19401 11.774089 2.452799 11.591797 2.749023 11.455078 C 3.045247 11.318359 3.36263 11.25 3.701172 11.25 L 16.25 11.25 C 16.582031 11.25 16.899414 11.315104 17.202148 11.445312 C 17.504883 11.575521 17.770182 11.751303 17.998047 11.972656 C 18.22591 12.194011 18.408203 12.4528 18.544922 12.749023 C 18.681641 13.045248 18.75 13.362631 18.75 13.701172 C 18.75 14.501953 18.626301 15.214844 18.378906 15.839844 C 18.13151 16.464844 17.796223 17.010092 17.373047 17.475586 C 16.949869 17.94108 16.453449 18.334961 15.883789 18.657227 C 15.314127 18.979492 14.705402 19.239908 14.057617 19.438477 C 13.40983 19.637045 12.739258 19.780273 12.045898 19.868164 C 11.352539 19.956055 10.670572 20 10 20 C 9.355469 20 8.714192 19.96582 8.076172 19.897461 C 7.43815 19.829102 6.809896 19.707031 6.191406 19.53125 C 5.488281 19.329428 4.835612 19.059244 4.233398 18.720703 C 3.631185 18.382162 3.108724 17.973633 2.666016 17.495117 C 2.223307 17.016602 1.876628 16.466473 1.625977 15.844727 C 1.375325 15.222982 1.25 14.52474 1.25 13.75 Z M 17.5 13.75 C 17.5 13.580729 17.467447 13.419597 17.402344 13.266602 C 17.337238 13.113607 17.247721 12.980144 17.133789 12.866211 C 17.019855 12.752279 16.886393 12.662761 16.733398 12.597656 C 16.580402 12.532553 16.41927 12.5 16.25 12.5 L 3.75 12.5 C 3.574219 12.5 3.411458 12.532553 3.261719 12.597656 C 3.111979 12.662761 2.980143 12.752279 2.866211 12.866211 C 2.752279 12.980144 2.66276 13.111979 2.597656 13.261719 C 2.532552 13.411459 2.5 13.574219 2.5 13.75 C 2.5 14.420573 2.610677 15.008139 2.832031 15.512695 C 3.053385 16.017252 3.352864 16.455078 3.730469 16.826172 C 4.108073 17.197266 4.545898 17.50651 5.043945 17.753906 C 5.541992 18.001303 6.069336 18.198242 6.625977 18.344727 C 7.182617 18.491211 7.750651 18.595377 8.330078 18.657227 C 8.909505 18.719076 9.466146 18.75 10 18.75 C 10.533854 18.75 11.090494 18.719076 11.669922 18.657227 C 12.249348 18.595377 12.817382 18.491211 13.374023 18.344727 C 13.930663 18.198242 14.458007 18.001303 14.956055 17.753906 C 15.454101 17.50651 15.891926 17.197266 16.269531 16.826172 C 16.647135 16.455078 16.946613 16.015625 17.167969 15.507812 C 17.389322 15 17.5 14.414062 17.5 13.75 Z " />
+        </Viewbox>
+
+        <muxc:ProgressBar Grid.Row="1" IsIndeterminate="True" />
+
+        <TextBlock
+            x:Name="StatusText"
+            Grid.Row="2"
+            HorizontalAlignment="Center"
+            Text="{x:Bind domain:Translator.AccountCreationDialog_Initializing}"
+            TextWrapping="Wrap" />
+
+        <Button
+            x:Name="AuthHelpDialogButton"
+            Grid.Row="0"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Visibility="Collapsed">
+            <Button.Content>
+                <Viewbox Width="20">
+                    <PathIcon Data="M960 4q132 0 254 34t228 96 194 150 149 193 97 229 34 254q0 132-34 254t-96 228-150 194-193 149-229 97-254 34q-132 0-254-34t-228-96-194-150-149-193-97-229T4 960q0-132 34-254t96-228 150-194 193-149 229-97T960 4zm0 1792q115 0 222-30t200-84 169-131 130-169 85-200 30-222q0-115-30-222t-84-200-131-169-169-130-200-85-222-30q-115 0-222 30t-200 84-169 131-130 169-85 200-30 222q0 115 30 222t84 200 131 169 169 130 200 85 222 30zm-64-388h128v128H896v-128zm64-960q66 0 124 25t101 69 69 102 26 124q0 60-19 104t-47 81-62 65-61 59-48 63-19 76v64H896v-64q0-60 19-104t47-81 62-65 61-59 48-63 19-76q0-40-15-75t-41-61-61-41-75-15q-40 0-75 15t-61 41-41 61-15 75H640q0-66 25-124t68-101 102-69 125-26z" />
+                </Viewbox>
+            </Button.Content>
+            <Button.Flyout>
+                <Flyout Placement="Bottom">
+                    <Grid MaxWidth="400" RowSpacing="12">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Foreground="Yellow" TextWrapping="WrapWholeWords">
+                            <Run FontWeight="SemiBold" Text="{x:Bind domain:Translator.AccountCreationDialog_GoogleAuthHelpClipboardText_Row0}" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="{x:Bind domain:Translator.AccountCreationDialog_GoogleAuthHelpClipboardText_Row1}" />
+                            <LineBreak />
+                            <Run Text="{x:Bind domain:Translator.AccountCreationDialog_GoogleAuthHelpClipboardText_Row2}" />
+                            <LineBreak />
+                            <Run Text="{x:Bind domain:Translator.AccountCreationDialog_GoogleAuthHelpClipboardText_Row3}" />
+                        </TextBlock>
+
+                        <Button
+                            x:Name="CopyClipboard"
+                            Grid.Row="1"
+                            HorizontalAlignment="Center"
+                            Click="CopyClicked"
+                            Content="{x:Bind domain:Translator.Buttons_Copy}" />
+                    </Grid>
+                </Flyout>
+            </Button.Flyout>
+        </Button>
+
+        <Button
+            x:Name="CancelButton"
+            Grid.Row="3"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Bottom"
+            Click="CancelButtonClicked"
+            Content="{x:Bind domain:Translator.Buttons_Cancel}" />
+
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="DialogStates">
+                <VisualState x:Name="PreparingFolders">
+                    <VisualState.Setters>
+                        <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.AccountCreationDialog_PreparingFolders}" />
+                        <Setter Target="CancelButton.Visibility" Value="Collapsed" />
+                        <Setter Target="DialogIcon.Data" Value="M1024,317.5L1024,507C1014.67,495.333 1004.67,484.167 994,473.5C983.333,462.833 972,453 960,444L960,320C960,311.333 958.333,303.083 955,295.25C951.667,287.417 947.083,280.583 941.25,274.75C935.417,268.917 928.583,264.333 920.75,261C912.917,257.667 904.667,256 896,256L522,256L458,298.5C436,312.833 412.333,320 387,320L64,320L64,832C64,841 65.6667,849.417 69,857.25C72.3333,865.083 76.8333,871.833 82.5,877.5C88.1667,883.167 94.9167,887.667 102.75,891C110.583,894.333 119,896 128,896L404.5,896C410.167,907.333 416.25,918.333 422.75,929C429.25,939.667 436.333,950 444,960L125.5,960C108.833,960 92.9167,956.583 77.75,949.75C62.5833,942.917 49.25,933.75 37.75,922.25C26.25,910.75 17.0833,897.417 10.25,882.25C3.41667,867.083 0,851.167 0,834.5L0,189.5C0,172.833 3.41667,156.917 10.25,141.75C17.0833,126.583 26.25,113.25 37.75,101.75C49.25,90.25 62.5833,81.0834 77.75,74.25C92.9167,67.4167 108.833,64.0001 125.5,64L368,64C388,64.0001 407.167,68.5001 425.5,77.5C443.833,86.5001 458.833,99.0001 470.5,115L528,192L898.5,192C915.167,192 931.083,195.417 946.25,202.25C961.417,209.083 974.75,218.25 986.25,229.75C997.75,241.25 1006.92,254.583 1013.75,269.75C1020.58,284.917 1024,300.833 1024,317.5ZM466,216L419,153.5C413,145.5 405.5,139.25 396.5,134.75C387.5,130.25 378,128 368,128L128,128C119,128 110.667,129.667 103,133C95.3333,136.333 88.5833,140.917 82.75,146.75C76.9167,152.583 72.3333,159.333 69,167C65.6667,174.667 64,183 64,192L64,256L387,256C394.333,256 401.5,254.667 408.5,252C415.5,249.333 422.25,246 428.75,242C435.25,238 441.583,233.667 447.75,229C453.917,224.333 460,220 466,216ZM1024,736C1024,775.667 1016.42,813 1001.25,848C986.083,883 965.5,913.5 939.5,939.5C913.5,965.5 883,986.083 848,1001.25C813,1016.42 775.667,1024 736,1024C696,1024 658.5,1016.5 623.5,1001.5C588.5,986.5 558,966 532,940C506,914 485.5,883.5 470.5,848.5C455.5,813.5 448,776 448,736C448,696.333 455.583,659 470.75,624C485.917,589 506.5,558.5 532.5,532.5C558.5,506.5 589,485.917 624,470.75C659,455.583 696.333,448 736,448C762.333,448 787.75,451.417 812.25,458.25C836.75,465.083 859.667,474.75 881,487.25C902.333,499.75 921.833,514.833 939.5,532.5C957.167,550.167 972.25,569.667 984.75,591C997.25,612.333 1006.92,635.25 1013.75,659.75C1020.58,684.25 1024,709.667 1024,736ZM896,576C896,567.333 892.833,559.833 886.5,553.5C880.167,547.167 872.667,544 864,544C857.667,544 852.5,545.167 848.5,547.5C844.5,549.833 841.25,552.917 838.75,556.75C836.25,560.583 834.5,565 833.5,570C832.5,575 832,580.167 832,585.5C816.333,577.167 800.917,570.833 785.75,566.5C770.583,562.167 754,560 736,560C724,560 711.75,561.25 699.25,563.75C686.75,566.25 674.5,569.917 662.5,574.75C650.5,579.583 639.083,585.417 628.25,592.25C617.417,599.083 608,607 600,616C597,619.333 594.667,622.75 593,626.25C591.333,629.75 590.5,633.833 590.5,638.5C590.5,647.5 593.667,655.167 600,661.5C606.333,667.833 614,671 623,671C628.667,671 634.75,668.583 641.25,663.75C647.75,658.917 655.333,653.5 664,647.5C672.667,641.5 682.75,636.083 694.25,631.25C705.75,626.417 719.333,624 735,624C746.667,624 757.5,625.25 767.5,627.75C777.5,630.25 787.667,634.333 798,640L785,640C779,640 773.083,640.25 767.25,640.75C761.417,641.25 756.167,642.583 751.5,644.75C746.833,646.917 743.083,650.167 740.25,654.5C737.417,658.833 736,664.667 736,672C736,680.667 739.167,688.167 745.5,694.5C751.833,700.833 759.333,704 768,704L864,704C872.667,704 880.167,700.833 886.5,694.5C892.833,688.167 896,680.667 896,672ZM881.5,833C881.5,824.333 878.333,816.833 872,810.5C865.667,804.167 858.167,801 849.5,801C842.833,801 836.333,803.417 830,808.25C823.667,813.083 816.333,818.5 808,824.5C799.667,830.5 789.833,835.917 778.5,840.75C767.167,845.583 753.333,848 737,848C725.333,848 714.5,846.75 704.5,844.25C694.5,841.75 684.333,837.667 674,832L687,832C692.667,832 698.417,831.75 704.25,831.25C710.083,830.75 715.333,829.417 720,827.25C724.667,825.083 728.5,821.833 731.5,817.5C734.5,813.167 736,807.333 736,800C736,791.333 732.833,783.833 726.5,777.5C720.167,771.167 712.667,768 704,768L608,768C599.333,768 591.833,771.167 585.5,777.5C579.167,783.833 576,791.333 576,800L576,896C576,904.667 579.167,912.167 585.5,918.5C591.833,924.833 599.333,928 608,928C614.333,928 619.5,926.833 623.5,924.5C627.5,922.167 630.75,919.083 633.25,915.25C635.75,911.417 637.5,907 638.5,902C639.5,897 640,891.833 640,886.5C655.667,894.833 671.083,901.167 686.25,905.5C701.417,909.833 718,912 736,912C748,912 760.333,910.75 773,908.25C785.667,905.75 797.917,902.083 809.75,897.25C821.583,892.417 832.833,886.583 843.5,879.75C854.167,872.917 863.667,865 872,856C878.333,849.333 881.5,841.667 881.5,833Z" />
+                    </VisualState.Setters>
+                </VisualState>
+
+                <VisualState x:Name="SigningIn">
+                    <VisualState.Setters>
+                        <Setter Target="CancelButton.Visibility" Value="Collapsed" />
+                        <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.AccountCreationDialog_SigninIn}" />
+                        <Setter Target="DialogIcon.Data" Value="M128,220C128,190 134.083,161.667 146.25,135C158.417,108.333 174.75,85 195.25,65C215.75,45 239.5,29.1667 266.5,17.5C293.5,5.83337 322,0 352,0C382.667,0 411.583,5.91669 438.75,17.75C465.917,29.5834 489.667,45.6667 510,66C530.333,86.3334 546.417,110.083 558.25,137.25C570.083,164.417 576,193.333 576,224C576,254.667 570.083,283.583 558.25,310.75C546.417,337.917 530.333,361.667 510,382C489.667,402.333 465.917,418.417 438.75,430.25C411.583,442.083 382.667,448 352,448C320.333,448 290.833,442 263.5,430C236.167,418 212.5,401.667 192.5,381C172.5,360.333 156.75,336.167 145.25,308.5C133.75,280.833 128,251.333 128,220ZM512,220.5C512,198.833 507.667,178.5 499,159.5C490.333,140.5 478.667,123.917 464,109.75C449.333,95.5834 432.333,84.4167 413,76.25C393.667,68.0834 373.333,64.0001 352,64C329.667,64.0001 308.833,68.1667 289.5,76.5C270.167,84.8334 253.25,96.25 238.75,110.75C224.25,125.25 212.833,142.167 204.5,161.5C196.167,180.833 192,201.667 192,224C192,246.333 196.167,267.167 204.5,286.5C212.833,305.833 224.25,322.75 238.75,337.25C253.25,351.75 270.167,363.167 289.5,371.5C308.833,379.833 329.667,384 352,384C375,384 396.25,379.75 415.75,371.25C435.25,362.75 452.167,351.083 466.5,336.25C480.833,321.417 492,304.083 500,284.25C508,264.417 512,243.167 512,220.5ZM640,284.5C640,262.833 644.333,242.5 653,223.5C661.667,204.5 673.333,187.917 688,173.75C702.667,159.583 719.667,148.417 739,140.25C758.333,132.083 778.667,128 800,128C822.333,128 843.167,132.167 862.5,140.5C881.833,148.833 898.75,160.25 913.25,174.75C927.75,189.25 939.167,206.167 947.5,225.5C955.833,244.833 960,265.667 960,288C960,310.333 955.833,331.167 947.5,350.5C939.167,369.833 927.75,386.75 913.25,401.25C898.75,415.75 881.833,427.167 862.5,435.5C843.167,443.833 822.333,448 800,448C777,448 755.75,443.75 736.25,435.25C716.75,426.75 699.833,415.083 685.5,400.25C671.167,385.417 660,368.083 652,348.25C644,328.417 640,307.167 640,284.5ZM896,288C896,275 893.5,262.667 888.5,251C883.5,239.333 876.583,229.083 867.75,220.25C858.917,211.417 848.667,204.5 837,199.5C825.333,194.5 813,192 800,192C787,192 774.667,194.5 763,199.5C751.333,204.5 741.083,211.417 732.25,220.25C723.417,229.083 716.5,239.333 711.5,251C706.5,262.667 704,275 704,288C704,301 706.5,313.333 711.5,325C716.5,336.667 723.417,346.917 732.25,355.75C741.083,364.583 751.333,371.5 763,376.5C774.667,381.5 787,384 800,384C813,384 825.333,381.5 837,376.5C848.667,371.5 858.917,364.583 867.75,355.75C876.583,346.917 883.5,336.667 888.5,325C893.5,313.333 896,301 896,288ZM0,638C0,623.667 2.41667,609 7.25,594C12.0833,579 19,565.417 28,553.25C37,541.083 47.9167,531.167 60.75,523.5C73.5833,515.833 88,512 104,512L600,512C616,512 630.417,515.833 643.25,523.5C656.083,531.167 667,541.083 676,553.25C685,565.417 691.917,579 696.75,594C701.583,609 704,623.667 704,638C704,667 701,694.917 695,721.75C689,748.583 679.75,773.833 667.25,797.5C654.75,821.167 639.083,842.917 620.25,862.75C601.417,882.583 579.167,899.833 553.5,914.5C538.5,923.167 522.75,930.417 506.25,936.25C489.75,942.083 473,946.75 456,950.25C439,953.75 421.75,956.25 404.25,957.75C386.75,959.25 369.333,960 352,960C317,960 282.333,956.833 248,950.5C213.667,944.167 181.167,932.167 150.5,914.5C124.5,899.5 102.083,882.167 83.25,862.5C64.4167,842.833 48.8333,821.25 36.5,797.75C24.1667,774.25 15,749.083 9,722.25C3,695.417 0,667.333 0,638ZM698.5,896C714.833,876.333 728.833,854.5 740.5,830.5C771.5,828.167 800.417,822.417 827.25,813.25C854.083,804.083 877.333,791.083 897,774.25C916.667,757.417 932.083,736.583 943.25,711.75C954.417,686.917 960,657.667 960,624C960,619 959.25,613.75 957.75,608.25C956.25,602.75 954.083,597.583 951.25,592.75C948.417,587.917 944.833,583.917 940.5,580.75C936.167,577.583 931.167,576 925.5,576L775,576C771.333,564.667 767,553.583 762,542.75C757,531.917 751.167,521.667 744.5,512L925.5,512C940.167,512 953.583,515.25 965.75,521.75C977.917,528.25 988.333,536.75 997,547.25C1005.67,557.75 1012.33,569.75 1017,583.25C1021.67,596.75 1024,610.333 1024,624C1024,675.333 1012.5,720.833 989.5,760.5C966.5,800.167 932.333,832.333 887,857C858.333,872.667 827.833,883.083 795.5,888.25C763.167,893.417 730.833,896 698.5,896ZM640,640C640,634.333 639.167,627.75 637.5,620.25C635.833,612.75 633.25,605.75 629.75,599.25C626.25,592.75 621.833,587.25 616.5,582.75C611.167,578.25 605,576 598,576L106,576C99,576 92.8333,578.25 87.5,582.75C82.1667,587.25 77.75,592.75 74.25,599.25C70.75,605.75 68.1667,612.75 66.5,620.25C64.8333,627.75 64,634.333 64,640C64,684.333 71.25,722.583 85.75,754.75C100.25,786.917 120.333,813.5 146,834.5C171.667,855.5 202.083,871 237.25,881C272.417,891 310.667,896 352,896C393.333,896 431.583,891 466.75,881C501.917,871 532.333,855.5 558,834.5C583.667,813.5 603.75,786.917 618.25,754.75C632.75,722.583 640,684.333 640,640Z" />
+                    </VisualState.Setters>
+                </VisualState>
+
+                <VisualState x:Name="FetchingProfileInformation">
+                    <VisualState.Setters>
+                        <Setter Target="CancelButton.Visibility" Value="Collapsed" />
+                        <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.AccountCreationDialog_FetchingProfileInformation}" />
+                        <Setter Target="DialogIcon.Data" Value="F1 M 1.875 17.5 C 1.621094 17.5 1.380208 17.451172 1.152344 17.353516 C 0.924479 17.255859 0.724284 17.120768 0.551758 16.948242 C 0.379232 16.775717 0.244141 16.575521 0.146484 16.347656 C 0.048828 16.119791 0 15.878906 0 15.625 L 0 4.375 C 0 4.121094 0.048828 3.880209 0.146484 3.652344 C 0.244141 3.42448 0.379232 3.224285 0.551758 3.051758 C 0.724284 2.879232 0.924479 2.744141 1.152344 2.646484 C 1.380208 2.548828 1.621094 2.5 1.875 2.5 L 18.125 2.5 C 18.378906 2.5 18.619791 2.548828 18.847656 2.646484 C 19.07552 2.744141 19.275715 2.879232 19.448242 3.051758 C 19.620768 3.224285 19.755859 3.42448 19.853516 3.652344 C 19.951172 3.880209 20 4.121094 20 4.375 L 20 15.625 C 20 15.878906 19.951172 16.119791 19.853516 16.347656 C 19.755859 16.575521 19.620768 16.775717 19.448242 16.948242 C 19.275715 17.120768 19.07552 17.255859 18.847656 17.353516 C 18.619791 17.451172 18.378906 17.5 18.125 17.5 Z M 5 16.25 L 5 14.375 C 5 14.121094 5.048828 13.880209 5.146484 13.652344 C 5.244141 13.424479 5.379231 13.224284 5.551758 13.051758 C 5.724284 12.879232 5.924479 12.744141 6.152344 12.646484 C 6.380208 12.548828 6.621094 12.5 6.875 12.5 L 13.125 12.5 C 13.378905 12.5 13.619791 12.548828 13.847656 12.646484 C 14.075521 12.744141 14.275716 12.879232 14.448242 13.051758 C 14.620768 13.224284 14.755858 13.424479 14.853516 13.652344 C 14.951171 13.880209 14.999999 14.121094 15 14.375 L 15 16.25 L 18.125 16.25 C 18.29427 16.25 18.440754 16.188152 18.564453 16.064453 C 18.68815 15.940756 18.75 15.794271 18.75 15.625 L 18.75 4.375 C 18.75 4.20573 18.68815 4.059246 18.564453 3.935547 C 18.440754 3.81185 18.29427 3.75 18.125 3.75 L 1.875 3.75 C 1.705729 3.75 1.559245 3.81185 1.435547 3.935547 C 1.311849 4.059246 1.25 4.20573 1.25 4.375 L 1.25 15.625 C 1.25 15.794271 1.311849 15.940756 1.435547 16.064453 C 1.559245 16.188152 1.705729 16.25 1.875 16.25 Z M 6.875 8.056641 C 6.875 7.633464 6.959635 7.236328 7.128906 6.865234 C 7.298177 6.494141 7.526041 6.170248 7.8125 5.893555 C 8.098958 5.616862 8.430989 5.398764 8.808594 5.239258 C 9.186197 5.079754 9.583333 5.000001 10 5 C 10.436197 5.000001 10.843099 5.081381 11.220703 5.244141 C 11.598307 5.406901 11.928711 5.629883 12.211914 5.913086 C 12.495117 6.196289 12.718099 6.526693 12.880859 6.904297 C 13.043619 7.281901 13.124999 7.688803 13.125 8.125 C 13.124999 8.561198 13.043619 8.9681 12.880859 9.345703 C 12.718099 9.723308 12.495117 10.053711 12.211914 10.336914 C 11.928711 10.620117 11.598307 10.8431 11.220703 11.005859 C 10.843099 11.16862 10.436197 11.25 10 11.25 C 9.550781 11.25 9.135742 11.166992 8.754883 11.000977 C 8.374023 10.834961 8.043619 10.607097 7.763672 10.317383 C 7.483724 10.02767 7.265625 9.689128 7.109375 9.301758 C 6.953125 8.914389 6.875 8.49935 6.875 8.056641 Z M 11.875 8.125 C 11.875 7.871094 11.826172 7.630209 11.728516 7.402344 C 11.630859 7.174479 11.495768 6.974284 11.323242 6.801758 C 11.150716 6.629232 10.950521 6.494141 10.722656 6.396484 C 10.494791 6.298828 10.253906 6.25 10 6.25 C 9.746094 6.25 9.505208 6.298828 9.277344 6.396484 C 9.049479 6.494141 8.849283 6.629232 8.676758 6.801758 C 8.504231 6.974284 8.369141 7.174479 8.271484 7.402344 C 8.173828 7.630209 8.125 7.871094 8.125 8.125 C 8.125 8.378906 8.173828 8.619792 8.271484 8.847656 C 8.369141 9.075521 8.504231 9.275717 8.676758 9.448242 C 8.849283 9.620769 9.049479 9.755859 9.277344 9.853516 C 9.505208 9.951172 9.746094 10 10 10 C 10.253906 10 10.494791 9.951172 10.722656 9.853516 C 10.950521 9.755859 11.150716 9.620769 11.323242 9.448242 C 11.495768 9.275717 11.630859 9.075521 11.728516 8.847656 C 11.826172 8.619792 11.875 8.378906 11.875 8.125 Z M 6.25 16.25 L 13.75 16.25 L 13.75 14.375 C 13.75 14.205729 13.68815 14.059245 13.564453 13.935547 C 13.440755 13.81185 13.294271 13.75 13.125 13.75 L 6.875 13.75 C 6.705729 13.75 6.559244 13.81185 6.435547 13.935547 C 6.311849 14.059245 6.25 14.205729 6.25 14.375 Z " />
+                    </VisualState.Setters>
+                </VisualState>
+
+                <VisualState x:Name="FetchingEvents">
+                    <VisualState.Setters>
+                        <Setter Target="CancelButton.Visibility" Value="Collapsed" />
+                        <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.AccountCreationDialog_FetchingEvents}" />
+                        <!--<Setter Target="DialogIcon.Data" Value="F1 M 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 15.078125 C 18.75 15.566406 18.650715 16.033529 18.452148 16.479492 C 18.25358 16.925455 17.986652 17.31608 17.651367 17.651367 C 17.31608 17.986654 16.925455 18.25358 16.479492 18.452148 C 16.033527 18.650717 15.566406 18.75 15.078125 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 Z M 4.951172 2.5 C 4.619141 2.5 4.303385 2.568359 4.003906 2.705078 C 3.704427 2.841797 3.44401 3.02409 3.222656 3.251953 C 3.001302 3.479818 2.825521 3.745117 2.695312 4.047852 C 2.565104 4.350587 2.5 4.66797 2.5 5 L 17.5 5 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 Z M 15.048828 17.5 C 15.374349 17.5 15.685221 17.433268 15.981445 17.299805 C 16.277668 17.166342 16.538086 16.987305 16.762695 16.762695 C 16.987305 16.538086 17.16634 16.27767 17.299805 15.981445 C 17.433268 15.685222 17.5 15.37435 17.5 15.048828 L 17.5 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.37435 2.566732 15.685222 2.700195 15.981445 C 2.833659 16.27767 3.012695 16.538086 3.237305 16.762695 C 3.461914 16.987305 3.722331 17.166342 4.018555 17.299805 C 4.314778 17.433268 4.625651 17.5 4.951172 17.5 Z M 5 10 C 5 9.824219 5.032552 9.661459 5.097656 9.511719 C 5.16276 9.361979 5.252278 9.230144 5.366211 9.116211 C 5.480143 9.002279 5.613606 8.912761 5.766602 8.847656 C 5.919596 8.782553 6.083984 8.75 6.259766 8.75 C 6.435547 8.75 6.598307 8.782553 6.748047 8.847656 C 6.897786 8.912761 7.027994 9.000651 7.138672 9.111328 C 7.249349 9.222006 7.337239 9.352214 7.402344 9.501953 C 7.467447 9.651693 7.5 9.814453 7.5 9.990234 C 7.5 10.166016 7.467447 10.330404 7.402344 10.483398 C 7.337239 10.636394 7.247721 10.769857 7.133789 10.883789 C 7.019856 10.997722 6.888021 11.08724 6.738281 11.152344 C 6.588542 11.217448 6.425781 11.25 6.25 11.25 C 6.074219 11.25 5.909831 11.217448 5.756836 11.152344 C 5.603841 11.08724 5.472005 10.99935 5.361328 10.888672 C 5.250651 10.777995 5.16276 10.646159 5.097656 10.493164 C 5.032552 10.34017 5 10.175781 5 10 Z M 8.75 10 C 8.75 9.824219 8.782552 9.661459 8.847656 9.511719 C 8.91276 9.361979 9.002278 9.230144 9.116211 9.116211 C 9.230143 9.002279 9.363606 8.912761 9.516602 8.847656 C 9.669596 8.782553 9.833984 8.75 10.009766 8.75 C 10.185547 8.75 10.348307 8.782553 10.498047 8.847656 C 10.647786 8.912761 10.777994 9.000651 10.888672 9.111328 C 10.999349 9.222006 11.087239 9.352214 11.152344 9.501953 C 11.217447 9.651693 11.25 9.814453 11.25 9.990234 C 11.25 10.166016 11.217447 10.330404 11.152344 10.483398 C 11.087239 10.636394 10.997721 10.769857 10.883789 10.883789 C 10.769856 10.997722 10.638021 11.08724 10.488281 11.152344 C 10.338541 11.217448 10.175781 11.25 10 11.25 C 9.824219 11.25 9.65983 11.217448 9.506836 11.152344 C 9.353841 11.08724 9.222005 10.99935 9.111328 10.888672 C 9.00065 10.777995 8.91276 10.646159 8.847656 10.493164 C 8.782552 10.34017 8.75 10.175781 8.75 10 Z M 15 9.990234 C 14.999999 10.166016 14.967447 10.330404 14.902344 10.483398 C 14.837239 10.636394 14.747721 10.769857 14.633789 10.883789 C 14.519856 10.997722 14.388021 11.08724 14.238281 11.152344 C 14.088541 11.217448 13.925781 11.25 13.75 11.25 C 13.574219 11.25 13.40983 11.217448 13.256836 11.152344 C 13.103841 11.08724 12.972005 10.99935 12.861328 10.888672 C 12.75065 10.777995 12.66276 10.646159 12.597656 10.493164 C 12.532552 10.34017 12.5 10.175781 12.5 10 C 12.5 9.824219 12.532552 9.661459 12.597656 9.511719 C 12.66276 9.361979 12.752278 9.230144 12.866211 9.116211 C 12.980143 9.002279 13.113605 8.912761 13.266602 8.847656 C 13.419596 8.782553 13.583984 8.75 13.759766 8.75 C 13.935547 8.75 14.098307 8.782553 14.248047 8.847656 C 14.397785 8.912761 14.527994 9.000651 14.638672 9.111328 C 14.749349 9.222006 14.837239 9.352214 14.902344 9.501953 C 14.967447 9.651693 14.999999 9.814453 15 9.990234 Z M 7.5 13.75 C 7.5 13.925781 7.467447 14.088542 7.402344 14.238281 C 7.337239 14.388021 7.247721 14.519857 7.133789 14.633789 C 7.019856 14.747722 6.886393 14.83724 6.733398 14.902344 C 6.580403 14.967448 6.416015 15 6.240234 15 C 6.064453 15 5.901692 14.967448 5.751953 14.902344 C 5.602213 14.83724 5.472005 14.74935 5.361328 14.638672 C 5.250651 14.527995 5.16276 14.397787 5.097656 14.248047 C 5.032552 14.098308 5 13.935547 5 13.759766 C 5 13.583984 5.032552 13.419597 5.097656 13.266602 C 5.16276 13.113607 5.252278 12.980144 5.366211 12.866211 C 5.480143 12.752279 5.611979 12.662761 5.761719 12.597656 C 5.911458 12.532553 6.074219 12.5 6.25 12.5 C 6.425781 12.5 6.590169 12.532553 6.743164 12.597656 C 6.896158 12.662761 7.027994 12.750651 7.138672 12.861328 C 7.249349 12.972006 7.337239 13.103842 7.402344 13.256836 C 7.467447 13.409831 7.5 13.574219 7.5 13.75 Z M 11.25 13.75 C 11.25 13.925781 11.217447 14.088542 11.152344 14.238281 C 11.087239 14.388021 10.997721 14.519857 10.883789 14.633789 C 10.769856 14.747722 10.636393 14.83724 10.483398 14.902344 C 10.330403 14.967448 10.166016 15 9.990234 15 C 9.814453 15 9.651692 14.967448 9.501953 14.902344 C 9.352213 14.83724 9.222005 14.74935 9.111328 14.638672 C 9.00065 14.527995 8.91276 14.397787 8.847656 14.248047 C 8.782552 14.098308 8.75 13.935547 8.75 13.759766 C 8.75 13.583984 8.782552 13.419597 8.847656 13.266602 C 8.91276 13.113607 9.002278 12.980144 9.116211 12.866211 C 9.230143 12.752279 9.361979 12.662761 9.511719 12.597656 C 9.661458 12.532553 9.824219 12.5 10 12.5 C 10.175781 12.5 10.340169 12.532553 10.493164 12.597656 C 10.646158 12.662761 10.777994 12.750651 10.888672 12.861328 C 10.999349 12.972006 11.087239 13.103842 11.152344 13.256836 C 11.217447 13.409831 11.25 13.574219 11.25 13.75 Z " />-->
+                    </VisualState.Setters>
+                </VisualState>
+
+                <VisualState x:Name="TestingConnection">
+                    <VisualState.Setters>
+                        <Setter Target="CancelButton.Visibility" Value="Collapsed" />
+                        <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.TestingImapConnectionMessage}" />
+                        <Setter Target="DialogIcon.Data" Value="F1 M 18.75 18.125 C 18.75 18.294271 18.68815 18.440756 18.564453 18.564453 C 18.440754 18.68815 18.29427 18.75 18.125 18.75 L 13.75 18.75 C 13.75 18.925781 13.717447 19.088541 13.652344 19.238281 C 13.587239 19.388021 13.497721 19.519857 13.383789 19.633789 C 13.269855 19.747721 13.13802 19.83724 12.988281 19.902344 C 12.838541 19.967447 12.675781 20 12.5 20 L 6.25 20 C 6.074219 20 5.909831 19.967447 5.756836 19.902344 C 5.603841 19.83724 5.472005 19.74935 5.361328 19.638672 C 5.250651 19.527994 5.16276 19.396158 5.097656 19.243164 C 5.032552 19.09017 5 18.925781 5 18.75 L 0.625 18.75 C 0.455729 18.75 0.309245 18.68815 0.185547 18.564453 C 0.061849 18.440756 0 18.294271 0 18.125 C 0 17.955729 0.061849 17.809244 0.185547 17.685547 C 0.309245 17.56185 0.455729 17.5 0.625 17.5 L 5 17.5 C 5 17.154949 5.120442 16.86198 5.361328 16.621094 C 5.608724 16.373699 5.904948 16.25 6.25 16.25 L 7.5 16.25 C 7.5 16.074219 7.532552 15.911459 7.597656 15.761719 C 7.66276 15.611979 7.752278 15.480144 7.866211 15.366211 C 7.980143 15.252279 8.111979 15.162761 8.261719 15.097656 C 8.411458 15.032553 8.574219 15 8.75 15 L 8.75 13.75 L 6.875 13.75 C 6.621094 13.75 6.380208 13.701172 6.152344 13.603516 C 5.924479 13.505859 5.724284 13.370769 5.551758 13.198242 C 5.379231 13.025717 5.244141 12.825521 5.146484 12.597656 C 5.048828 12.369792 5 12.128906 5 11.875 L 5 1.875 C 5 1.621094 5.048828 1.380209 5.146484 1.152344 C 5.244141 0.92448 5.379231 0.724285 5.551758 0.551758 C 5.724284 0.379232 5.924479 0.244141 6.152344 0.146484 C 6.380208 0.048828 6.621094 0 6.875 0 L 11.875 0 C 12.128906 0 12.369791 0.048828 12.597656 0.146484 C 12.825521 0.244141 13.025716 0.379232 13.198242 0.551758 C 13.370768 0.724285 13.505859 0.92448 13.603516 1.152344 C 13.701172 1.380209 13.75 1.621094 13.75 1.875 L 13.75 11.875 C 13.75 12.128906 13.701172 12.369792 13.603516 12.597656 C 13.505859 12.825521 13.370768 13.025717 13.198242 13.198242 C 13.025716 13.370769 12.825521 13.505859 12.597656 13.603516 C 12.369791 13.701172 12.128906 13.75 11.875 13.75 L 10 13.75 L 10 15 C 10.169271 15 10.330403 15.032553 10.483398 15.097656 C 10.636393 15.162761 10.769856 15.252279 10.883789 15.366211 C 10.997721 15.480144 11.087239 15.613607 11.152344 15.766602 C 11.217447 15.919597 11.25 16.080729 11.25 16.25 L 12.5 16.25 C 12.669271 16.25 12.828775 16.282553 12.978516 16.347656 C 13.128255 16.41276 13.261719 16.503906 13.378906 16.621094 C 13.626302 16.86849 13.75 17.161459 13.75 17.5 L 18.125 17.5 C 18.29427 17.5 18.440754 17.56185 18.564453 17.685547 C 18.68815 17.809244 18.75 17.955729 18.75 18.125 Z M 11.875 12.5 C 12.04427 12.5 12.190754 12.438151 12.314453 12.314453 C 12.43815 12.190756 12.5 12.044271 12.5 11.875 L 12.5 1.875 C 12.5 1.70573 12.43815 1.559246 12.314453 1.435547 C 12.190754 1.31185 12.04427 1.25 11.875 1.25 L 6.875 1.25 C 6.705729 1.25 6.559244 1.31185 6.435547 1.435547 C 6.311849 1.559246 6.25 1.70573 6.25 1.875 L 6.25 11.875 C 6.25 12.044271 6.311849 12.190756 6.435547 12.314453 C 6.559244 12.438151 6.705729 12.5 6.875 12.5 Z M 10.625 2.5 C 10.794271 2.5 10.940755 2.56185 11.064453 2.685547 C 11.18815 2.809246 11.25 2.95573 11.25 3.125 C 11.25 3.294271 11.18815 3.440756 11.064453 3.564453 C 10.940755 3.688152 10.794271 3.75 10.625 3.75 L 8.125 3.75 C 7.955729 3.75 7.809245 3.688152 7.685547 3.564453 C 7.561849 3.440756 7.5 3.294271 7.5 3.125 C 7.5 2.95573 7.561849 2.809246 7.685547 2.685547 C 7.809245 2.56185 7.955729 2.5 8.125 2.5 Z M 10.625 5 C 10.794271 5.000001 10.940755 5.06185 11.064453 5.185547 C 11.18815 5.309245 11.25 5.455729 11.25 5.625 C 11.25 5.794271 11.18815 5.940756 11.064453 6.064453 C 10.940755 6.188151 10.794271 6.25 10.625 6.25 L 8.125 6.25 C 7.955729 6.25 7.809245 6.188151 7.685547 6.064453 C 7.561849 5.940756 7.5 5.794271 7.5 5.625 C 7.5 5.455729 7.561849 5.309245 7.685547 5.185547 C 7.809245 5.06185 7.955729 5.000001 8.125 5 Z M 12.5 18.75 L 12.5 17.5 L 10.625 17.5 C 10.481771 17.5 10.367838 17.47233 10.283203 17.416992 C 10.198567 17.361654 10.135091 17.290039 10.092773 17.202148 C 10.050455 17.114258 10.022786 17.016602 10.009766 16.90918 C 9.996744 16.801758 9.990234 16.692709 9.990234 16.582031 C 9.990234 16.523438 9.991861 16.466471 9.995117 16.411133 C 9.998372 16.355795 10 16.302084 10 16.25 L 8.75 16.25 L 8.75 16.582031 C 8.75 16.692709 8.743489 16.801758 8.730469 16.90918 C 8.717447 17.016602 8.689778 17.114258 8.647461 17.202148 C 8.605143 17.290039 8.543294 17.361654 8.461914 17.416992 C 8.380533 17.47233 8.268229 17.5 8.125 17.5 L 6.25 17.5 L 6.25 18.75 Z" />
+                    </VisualState.Setters>
+                </VisualState>
+
+                <VisualState x:Name="Idle" />
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+    </Grid>
+</UserControl>
diff --git a/Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml.cs b/Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml.cs
new file mode 100644
index 00000000..ac556d22
--- /dev/null
+++ b/Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Messaging.UI;
+
+
+namespace Wino.Core.UWP.Controls
+{
+    public sealed partial class AccountCreationDialogControl : UserControl, IRecipient<CopyAuthURLRequested>
+    {
+        private string copyClipboardURL;
+
+        public event EventHandler CancelClicked;
+
+        public AccountCreationDialogState State
+        {
+            get { return (AccountCreationDialogState)GetValue(StateProperty); }
+            set { SetValue(StateProperty, value); }
+        }
+
+        public static readonly DependencyProperty StateProperty = DependencyProperty.Register(nameof(State), typeof(AccountCreationDialogState), typeof(AccountCreationDialogControl), new PropertyMetadata(AccountCreationDialogState.Idle, new PropertyChangedCallback(OnStateChanged)));
+
+        public AccountCreationDialogControl()
+        {
+            InitializeComponent();
+        }
+
+        private static void OnStateChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+        {
+            if (obj is AccountCreationDialogControl dialog)
+            {
+                dialog.UpdateVisualStates();
+            }
+        }
+
+        private void UpdateVisualStates() => VisualStateManager.GoToState(this, State.ToString(), false);
+
+        public async void Receive(CopyAuthURLRequested message)
+        {
+            copyClipboardURL = message.AuthURL;
+
+            await Task.Delay(2000);
+
+            await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+            {
+                AuthHelpDialogButton.Visibility = Windows.UI.Xaml.Visibility.Visible;
+            });
+        }
+
+        private void ControlLoaded(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        {
+            WeakReferenceMessenger.Default.Register(this);
+        }
+
+        private void ControlUnloaded(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        {
+            WeakReferenceMessenger.Default.UnregisterAll(this);
+        }
+
+        private async void CopyClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        {
+            if (string.IsNullOrEmpty(copyClipboardURL)) return;
+
+            var clipboardService = WinoApplication.Current.Services.GetService<IClipboardService>();
+            await clipboardService.CopyClipboardAsync(copyClipboardURL);
+        }
+
+
+        private void CancelButtonClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e) => CancelClicked?.Invoke(this, null);
+    }
+}
diff --git a/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml b/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml
index e5449e20..6de492a6 100644
--- a/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml
+++ b/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml
@@ -1,129 +1,20 @@
-<dialogs:BaseAccountCreationDialog
+<ContentDialog
     x:Class="Wino.Dialogs.AccountCreationDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Wino.Core.UWP.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dialogs="using:Wino.Dialogs"
-    xmlns:domain="using:Wino.Core.Domain"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    x:Name="Root"
     Closing="DialogClosing"
     CornerRadius="8"
     mc:Ignorable="d">
-    <Grid x:Name="RootGrid" RowSpacing="10">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
 
-        <Viewbox Width="24">
-            <PathIcon x:Name="DialogIcon" Data="F1 M 5 4.902344 C 5 4.225262 5.135091 3.588867 5.405273 2.993164 C 5.675456 2.397461 6.040039 1.878256 6.499023 1.435547 C 6.958008 0.99284 7.488606 0.642904 8.09082 0.385742 C 8.693033 0.128582 9.329427 0 10 0 C 10.690104 0 11.339518 0.130209 11.948242 0.390625 C 12.556965 0.651043 13.087564 1.007488 13.540039 1.459961 C 13.992513 1.912436 14.348958 2.443035 14.609375 3.051758 C 14.869791 3.660482 14.999999 4.309896 15 5 C 14.999999 5.690104 14.869791 6.339519 14.609375 6.948242 C 14.348958 7.556967 13.992513 8.087565 13.540039 8.540039 C 13.087564 8.992514 12.556965 9.348959 11.948242 9.609375 C 11.339518 9.869792 10.690104 10 10 10 C 9.290364 10 8.631185 9.866537 8.022461 9.599609 C 7.413737 9.332683 6.884766 8.9681 6.435547 8.505859 C 5.986328 8.043621 5.634766 7.503256 5.380859 6.884766 C 5.126953 6.266276 5 5.605469 5 4.902344 Z M 13.75 4.921875 C 13.75 4.414062 13.649088 3.937176 13.447266 3.491211 C 13.245442 3.045248 12.973633 2.65625 12.631836 2.324219 C 12.290039 1.992188 11.891275 1.730145 11.435547 1.538086 C 10.979817 1.346029 10.501302 1.25 10 1.25 C 9.479166 1.25 8.990885 1.347656 8.535156 1.542969 C 8.079427 1.738281 7.682291 2.005209 7.34375 2.34375 C 7.005208 2.682293 6.738281 3.079428 6.542969 3.535156 C 6.347656 3.990887 6.25 4.479167 6.25 5 C 6.25 5.520834 6.347656 6.009115 6.542969 6.464844 C 6.738281 6.920573 7.005208 7.317709 7.34375 7.65625 C 7.682291 7.994792 8.079427 8.261719 8.535156 8.457031 C 8.990885 8.652344 9.479166 8.75 10 8.75 C 10.533854 8.75 11.030273 8.650717 11.489258 8.452148 C 11.948242 8.253581 12.345377 7.980144 12.680664 7.631836 C 13.015949 7.283529 13.277994 6.876629 13.466797 6.411133 C 13.655599 5.945639 13.75 5.449219 13.75 4.921875 Z M 1.25 13.75 C 1.25 13.417969 1.315104 13.100586 1.445312 12.797852 C 1.575521 12.495117 1.751302 12.229818 1.972656 12.001953 C 2.19401 11.774089 2.452799 11.591797 2.749023 11.455078 C 3.045247 11.318359 3.36263 11.25 3.701172 11.25 L 16.25 11.25 C 16.582031 11.25 16.899414 11.315104 17.202148 11.445312 C 17.504883 11.575521 17.770182 11.751303 17.998047 11.972656 C 18.22591 12.194011 18.408203 12.4528 18.544922 12.749023 C 18.681641 13.045248 18.75 13.362631 18.75 13.701172 C 18.75 14.501953 18.626301 15.214844 18.378906 15.839844 C 18.13151 16.464844 17.796223 17.010092 17.373047 17.475586 C 16.949869 17.94108 16.453449 18.334961 15.883789 18.657227 C 15.314127 18.979492 14.705402 19.239908 14.057617 19.438477 C 13.40983 19.637045 12.739258 19.780273 12.045898 19.868164 C 11.352539 19.956055 10.670572 20 10 20 C 9.355469 20 8.714192 19.96582 8.076172 19.897461 C 7.43815 19.829102 6.809896 19.707031 6.191406 19.53125 C 5.488281 19.329428 4.835612 19.059244 4.233398 18.720703 C 3.631185 18.382162 3.108724 17.973633 2.666016 17.495117 C 2.223307 17.016602 1.876628 16.466473 1.625977 15.844727 C 1.375325 15.222982 1.25 14.52474 1.25 13.75 Z M 17.5 13.75 C 17.5 13.580729 17.467447 13.419597 17.402344 13.266602 C 17.337238 13.113607 17.247721 12.980144 17.133789 12.866211 C 17.019855 12.752279 16.886393 12.662761 16.733398 12.597656 C 16.580402 12.532553 16.41927 12.5 16.25 12.5 L 3.75 12.5 C 3.574219 12.5 3.411458 12.532553 3.261719 12.597656 C 3.111979 12.662761 2.980143 12.752279 2.866211 12.866211 C 2.752279 12.980144 2.66276 13.111979 2.597656 13.261719 C 2.532552 13.411459 2.5 13.574219 2.5 13.75 C 2.5 14.420573 2.610677 15.008139 2.832031 15.512695 C 3.053385 16.017252 3.352864 16.455078 3.730469 16.826172 C 4.108073 17.197266 4.545898 17.50651 5.043945 17.753906 C 5.541992 18.001303 6.069336 18.198242 6.625977 18.344727 C 7.182617 18.491211 7.750651 18.595377 8.330078 18.657227 C 8.909505 18.719076 9.466146 18.75 10 18.75 C 10.533854 18.75 11.090494 18.719076 11.669922 18.657227 C 12.249348 18.595377 12.817382 18.491211 13.374023 18.344727 C 13.930663 18.198242 14.458007 18.001303 14.956055 17.753906 C 15.454101 17.50651 15.891926 17.197266 16.269531 16.826172 C 16.647135 16.455078 16.946613 16.015625 17.167969 15.507812 C 17.389322 15 17.5 14.414062 17.5 13.75 Z " />
-        </Viewbox>
+    <!--  ContentDialogs do not support VSM.  -->
 
-        <muxc:ProgressBar Grid.Row="1" IsIndeterminate="True" />
+    <controls:AccountCreationDialogControl
+        VerticalAlignment="Center"
+        CancelClicked="CancelClicked"
+        State="{x:Bind State, Mode=OneWay}" />
 
-        <TextBlock
-            x:Name="StatusText"
-            Grid.Row="2"
-            HorizontalAlignment="Center"
-            Text="{x:Bind domain:Translator.AccountCreationDialog_Initializing}"
-            TextWrapping="Wrap" />
-
-        <Button
-            x:Name="AuthHelpDialogButton"
-            Grid.Row="0"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Top"
-            Visibility="Collapsed">
-            <Button.Content>
-                <Viewbox Width="20">
-                    <PathIcon Data="M960 4q132 0 254 34t228 96 194 150 149 193 97 229 34 254q0 132-34 254t-96 228-150 194-193 149-229 97-254 34q-132 0-254-34t-228-96-194-150-149-193-97-229T4 960q0-132 34-254t96-228 150-194 193-149 229-97T960 4zm0 1792q115 0 222-30t200-84 169-131 130-169 85-200 30-222q0-115-30-222t-84-200-131-169-169-130-200-85-222-30q-115 0-222 30t-200 84-169 131-130 169-85 200-30 222q0 115 30 222t84 200 131 169 169 130 200 85 222 30zm-64-388h128v128H896v-128zm64-960q66 0 124 25t101 69 69 102 26 124q0 60-19 104t-47 81-62 65-61 59-48 63-19 76v64H896v-64q0-60 19-104t47-81 62-65 61-59 48-63 19-76q0-40-15-75t-41-61-61-41-75-15q-40 0-75 15t-61 41-41 61-15 75H640q0-66 25-124t68-101 102-69 125-26z" />
-                </Viewbox>
-            </Button.Content>
-            <Button.Flyout>
-                <Flyout Placement="Bottom">
-                    <Grid MaxWidth="400" RowSpacing="12">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                        <TextBlock Foreground="Yellow" TextWrapping="WrapWholeWords">
-                            <Run FontWeight="SemiBold" Text="{x:Bind domain:Translator.AccountCreationDialog_GoogleAuthHelpClipboardText_Row0}" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="{x:Bind domain:Translator.AccountCreationDialog_GoogleAuthHelpClipboardText_Row1}" />
-                            <LineBreak />
-                            <Run Text="{x:Bind domain:Translator.AccountCreationDialog_GoogleAuthHelpClipboardText_Row2}" />
-                            <LineBreak />
-                            <Run Text="{x:Bind domain:Translator.AccountCreationDialog_GoogleAuthHelpClipboardText_Row3}" />
-                        </TextBlock>
-
-                        <Button
-                            x:Name="CopyClipboard"
-                            Grid.Row="1"
-                            HorizontalAlignment="Center"
-                            Click="CopyClicked"
-                            Content="{x:Bind domain:Translator.Buttons_Copy}" />
-                    </Grid>
-                </Flyout>
-            </Button.Flyout>
-        </Button>
-
-        <Button
-            x:Name="CancelButton"
-            Grid.Row="3"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Bottom"
-            Click="CancelClicked"
-            Content="{x:Bind domain:Translator.Buttons_Cancel}" />
-
-    </Grid>
-    <VisualStateManager.VisualStateGroups>
-        <VisualStateGroup x:Name="DialogStates">
-            <!--<VisualState x:Name="PreparingFolders">
-                <VisualState.Setters>
-                    <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.AccountCreationDialog_PreparingFolders}" />
-                    <Setter Target="CancelButton.Visibility" Value="Collapsed" />
-                    <Setter Target="DialogIcon.Data" Value="M1024,317.5L1024,507C1014.67,495.333 1004.67,484.167 994,473.5C983.333,462.833 972,453 960,444L960,320C960,311.333 958.333,303.083 955,295.25C951.667,287.417 947.083,280.583 941.25,274.75C935.417,268.917 928.583,264.333 920.75,261C912.917,257.667 904.667,256 896,256L522,256L458,298.5C436,312.833 412.333,320 387,320L64,320L64,832C64,841 65.6667,849.417 69,857.25C72.3333,865.083 76.8333,871.833 82.5,877.5C88.1667,883.167 94.9167,887.667 102.75,891C110.583,894.333 119,896 128,896L404.5,896C410.167,907.333 416.25,918.333 422.75,929C429.25,939.667 436.333,950 444,960L125.5,960C108.833,960 92.9167,956.583 77.75,949.75C62.5833,942.917 49.25,933.75 37.75,922.25C26.25,910.75 17.0833,897.417 10.25,882.25C3.41667,867.083 0,851.167 0,834.5L0,189.5C0,172.833 3.41667,156.917 10.25,141.75C17.0833,126.583 26.25,113.25 37.75,101.75C49.25,90.25 62.5833,81.0834 77.75,74.25C92.9167,67.4167 108.833,64.0001 125.5,64L368,64C388,64.0001 407.167,68.5001 425.5,77.5C443.833,86.5001 458.833,99.0001 470.5,115L528,192L898.5,192C915.167,192 931.083,195.417 946.25,202.25C961.417,209.083 974.75,218.25 986.25,229.75C997.75,241.25 1006.92,254.583 1013.75,269.75C1020.58,284.917 1024,300.833 1024,317.5ZM466,216L419,153.5C413,145.5 405.5,139.25 396.5,134.75C387.5,130.25 378,128 368,128L128,128C119,128 110.667,129.667 103,133C95.3333,136.333 88.5833,140.917 82.75,146.75C76.9167,152.583 72.3333,159.333 69,167C65.6667,174.667 64,183 64,192L64,256L387,256C394.333,256 401.5,254.667 408.5,252C415.5,249.333 422.25,246 428.75,242C435.25,238 441.583,233.667 447.75,229C453.917,224.333 460,220 466,216ZM1024,736C1024,775.667 1016.42,813 1001.25,848C986.083,883 965.5,913.5 939.5,939.5C913.5,965.5 883,986.083 848,1001.25C813,1016.42 775.667,1024 736,1024C696,1024 658.5,1016.5 623.5,1001.5C588.5,986.5 558,966 532,940C506,914 485.5,883.5 470.5,848.5C455.5,813.5 448,776 448,736C448,696.333 455.583,659 470.75,624C485.917,589 506.5,558.5 532.5,532.5C558.5,506.5 589,485.917 624,470.75C659,455.583 696.333,448 736,448C762.333,448 787.75,451.417 812.25,458.25C836.75,465.083 859.667,474.75 881,487.25C902.333,499.75 921.833,514.833 939.5,532.5C957.167,550.167 972.25,569.667 984.75,591C997.25,612.333 1006.92,635.25 1013.75,659.75C1020.58,684.25 1024,709.667 1024,736ZM896,576C896,567.333 892.833,559.833 886.5,553.5C880.167,547.167 872.667,544 864,544C857.667,544 852.5,545.167 848.5,547.5C844.5,549.833 841.25,552.917 838.75,556.75C836.25,560.583 834.5,565 833.5,570C832.5,575 832,580.167 832,585.5C816.333,577.167 800.917,570.833 785.75,566.5C770.583,562.167 754,560 736,560C724,560 711.75,561.25 699.25,563.75C686.75,566.25 674.5,569.917 662.5,574.75C650.5,579.583 639.083,585.417 628.25,592.25C617.417,599.083 608,607 600,616C597,619.333 594.667,622.75 593,626.25C591.333,629.75 590.5,633.833 590.5,638.5C590.5,647.5 593.667,655.167 600,661.5C606.333,667.833 614,671 623,671C628.667,671 634.75,668.583 641.25,663.75C647.75,658.917 655.333,653.5 664,647.5C672.667,641.5 682.75,636.083 694.25,631.25C705.75,626.417 719.333,624 735,624C746.667,624 757.5,625.25 767.5,627.75C777.5,630.25 787.667,634.333 798,640L785,640C779,640 773.083,640.25 767.25,640.75C761.417,641.25 756.167,642.583 751.5,644.75C746.833,646.917 743.083,650.167 740.25,654.5C737.417,658.833 736,664.667 736,672C736,680.667 739.167,688.167 745.5,694.5C751.833,700.833 759.333,704 768,704L864,704C872.667,704 880.167,700.833 886.5,694.5C892.833,688.167 896,680.667 896,672ZM881.5,833C881.5,824.333 878.333,816.833 872,810.5C865.667,804.167 858.167,801 849.5,801C842.833,801 836.333,803.417 830,808.25C823.667,813.083 816.333,818.5 808,824.5C799.667,830.5 789.833,835.917 778.5,840.75C767.167,845.583 753.333,848 737,848C725.333,848 714.5,846.75 704.5,844.25C694.5,841.75 684.333,837.667 674,832L687,832C692.667,832 698.417,831.75 704.25,831.25C710.083,830.75 715.333,829.417 720,827.25C724.667,825.083 728.5,821.833 731.5,817.5C734.5,813.167 736,807.333 736,800C736,791.333 732.833,783.833 726.5,777.5C720.167,771.167 712.667,768 704,768L608,768C599.333,768 591.833,771.167 585.5,777.5C579.167,783.833 576,791.333 576,800L576,896C576,904.667 579.167,912.167 585.5,918.5C591.833,924.833 599.333,928 608,928C614.333,928 619.5,926.833 623.5,924.5C627.5,922.167 630.75,919.083 633.25,915.25C635.75,911.417 637.5,907 638.5,902C639.5,897 640,891.833 640,886.5C655.667,894.833 671.083,901.167 686.25,905.5C701.417,909.833 718,912 736,912C748,912 760.333,910.75 773,908.25C785.667,905.75 797.917,902.083 809.75,897.25C821.583,892.417 832.833,886.583 843.5,879.75C854.167,872.917 863.667,865 872,856C878.333,849.333 881.5,841.667 881.5,833Z" />
-                </VisualState.Setters>
-            </VisualState>
-
-            <VisualState x:Name="SigningIn">
-                <VisualState.Setters>
-                    <Setter Target="CancelButton.Visibility" Value="Collapsed" />
-                    <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.AccountCreationDialog_SigninIn}" />
-                    <Setter Target="DialogIcon.Data" Value="M128,220C128,190 134.083,161.667 146.25,135C158.417,108.333 174.75,85 195.25,65C215.75,45 239.5,29.1667 266.5,17.5C293.5,5.83337 322,0 352,0C382.667,0 411.583,5.91669 438.75,17.75C465.917,29.5834 489.667,45.6667 510,66C530.333,86.3334 546.417,110.083 558.25,137.25C570.083,164.417 576,193.333 576,224C576,254.667 570.083,283.583 558.25,310.75C546.417,337.917 530.333,361.667 510,382C489.667,402.333 465.917,418.417 438.75,430.25C411.583,442.083 382.667,448 352,448C320.333,448 290.833,442 263.5,430C236.167,418 212.5,401.667 192.5,381C172.5,360.333 156.75,336.167 145.25,308.5C133.75,280.833 128,251.333 128,220ZM512,220.5C512,198.833 507.667,178.5 499,159.5C490.333,140.5 478.667,123.917 464,109.75C449.333,95.5834 432.333,84.4167 413,76.25C393.667,68.0834 373.333,64.0001 352,64C329.667,64.0001 308.833,68.1667 289.5,76.5C270.167,84.8334 253.25,96.25 238.75,110.75C224.25,125.25 212.833,142.167 204.5,161.5C196.167,180.833 192,201.667 192,224C192,246.333 196.167,267.167 204.5,286.5C212.833,305.833 224.25,322.75 238.75,337.25C253.25,351.75 270.167,363.167 289.5,371.5C308.833,379.833 329.667,384 352,384C375,384 396.25,379.75 415.75,371.25C435.25,362.75 452.167,351.083 466.5,336.25C480.833,321.417 492,304.083 500,284.25C508,264.417 512,243.167 512,220.5ZM640,284.5C640,262.833 644.333,242.5 653,223.5C661.667,204.5 673.333,187.917 688,173.75C702.667,159.583 719.667,148.417 739,140.25C758.333,132.083 778.667,128 800,128C822.333,128 843.167,132.167 862.5,140.5C881.833,148.833 898.75,160.25 913.25,174.75C927.75,189.25 939.167,206.167 947.5,225.5C955.833,244.833 960,265.667 960,288C960,310.333 955.833,331.167 947.5,350.5C939.167,369.833 927.75,386.75 913.25,401.25C898.75,415.75 881.833,427.167 862.5,435.5C843.167,443.833 822.333,448 800,448C777,448 755.75,443.75 736.25,435.25C716.75,426.75 699.833,415.083 685.5,400.25C671.167,385.417 660,368.083 652,348.25C644,328.417 640,307.167 640,284.5ZM896,288C896,275 893.5,262.667 888.5,251C883.5,239.333 876.583,229.083 867.75,220.25C858.917,211.417 848.667,204.5 837,199.5C825.333,194.5 813,192 800,192C787,192 774.667,194.5 763,199.5C751.333,204.5 741.083,211.417 732.25,220.25C723.417,229.083 716.5,239.333 711.5,251C706.5,262.667 704,275 704,288C704,301 706.5,313.333 711.5,325C716.5,336.667 723.417,346.917 732.25,355.75C741.083,364.583 751.333,371.5 763,376.5C774.667,381.5 787,384 800,384C813,384 825.333,381.5 837,376.5C848.667,371.5 858.917,364.583 867.75,355.75C876.583,346.917 883.5,336.667 888.5,325C893.5,313.333 896,301 896,288ZM0,638C0,623.667 2.41667,609 7.25,594C12.0833,579 19,565.417 28,553.25C37,541.083 47.9167,531.167 60.75,523.5C73.5833,515.833 88,512 104,512L600,512C616,512 630.417,515.833 643.25,523.5C656.083,531.167 667,541.083 676,553.25C685,565.417 691.917,579 696.75,594C701.583,609 704,623.667 704,638C704,667 701,694.917 695,721.75C689,748.583 679.75,773.833 667.25,797.5C654.75,821.167 639.083,842.917 620.25,862.75C601.417,882.583 579.167,899.833 553.5,914.5C538.5,923.167 522.75,930.417 506.25,936.25C489.75,942.083 473,946.75 456,950.25C439,953.75 421.75,956.25 404.25,957.75C386.75,959.25 369.333,960 352,960C317,960 282.333,956.833 248,950.5C213.667,944.167 181.167,932.167 150.5,914.5C124.5,899.5 102.083,882.167 83.25,862.5C64.4167,842.833 48.8333,821.25 36.5,797.75C24.1667,774.25 15,749.083 9,722.25C3,695.417 0,667.333 0,638ZM698.5,896C714.833,876.333 728.833,854.5 740.5,830.5C771.5,828.167 800.417,822.417 827.25,813.25C854.083,804.083 877.333,791.083 897,774.25C916.667,757.417 932.083,736.583 943.25,711.75C954.417,686.917 960,657.667 960,624C960,619 959.25,613.75 957.75,608.25C956.25,602.75 954.083,597.583 951.25,592.75C948.417,587.917 944.833,583.917 940.5,580.75C936.167,577.583 931.167,576 925.5,576L775,576C771.333,564.667 767,553.583 762,542.75C757,531.917 751.167,521.667 744.5,512L925.5,512C940.167,512 953.583,515.25 965.75,521.75C977.917,528.25 988.333,536.75 997,547.25C1005.67,557.75 1012.33,569.75 1017,583.25C1021.67,596.75 1024,610.333 1024,624C1024,675.333 1012.5,720.833 989.5,760.5C966.5,800.167 932.333,832.333 887,857C858.333,872.667 827.833,883.083 795.5,888.25C763.167,893.417 730.833,896 698.5,896ZM640,640C640,634.333 639.167,627.75 637.5,620.25C635.833,612.75 633.25,605.75 629.75,599.25C626.25,592.75 621.833,587.25 616.5,582.75C611.167,578.25 605,576 598,576L106,576C99,576 92.8333,578.25 87.5,582.75C82.1667,587.25 77.75,592.75 74.25,599.25C70.75,605.75 68.1667,612.75 66.5,620.25C64.8333,627.75 64,634.333 64,640C64,684.333 71.25,722.583 85.75,754.75C100.25,786.917 120.333,813.5 146,834.5C171.667,855.5 202.083,871 237.25,881C272.417,891 310.667,896 352,896C393.333,896 431.583,891 466.75,881C501.917,871 532.333,855.5 558,834.5C583.667,813.5 603.75,786.917 618.25,754.75C632.75,722.583 640,684.333 640,640Z" />
-                </VisualState.Setters>
-            </VisualState>
-
-            <VisualState x:Name="FetchingProfileInformation">
-                <VisualState.Setters>
-                    <Setter Target="CancelButton.Visibility" Value="Collapsed" />
-                    <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.AccountCreationDialog_FetchingProfileInformation}" />
-                    <Setter Target="DialogIcon.Data" Value="F1 M 1.875 17.5 C 1.621094 17.5 1.380208 17.451172 1.152344 17.353516 C 0.924479 17.255859 0.724284 17.120768 0.551758 16.948242 C 0.379232 16.775717 0.244141 16.575521 0.146484 16.347656 C 0.048828 16.119791 0 15.878906 0 15.625 L 0 4.375 C 0 4.121094 0.048828 3.880209 0.146484 3.652344 C 0.244141 3.42448 0.379232 3.224285 0.551758 3.051758 C 0.724284 2.879232 0.924479 2.744141 1.152344 2.646484 C 1.380208 2.548828 1.621094 2.5 1.875 2.5 L 18.125 2.5 C 18.378906 2.5 18.619791 2.548828 18.847656 2.646484 C 19.07552 2.744141 19.275715 2.879232 19.448242 3.051758 C 19.620768 3.224285 19.755859 3.42448 19.853516 3.652344 C 19.951172 3.880209 20 4.121094 20 4.375 L 20 15.625 C 20 15.878906 19.951172 16.119791 19.853516 16.347656 C 19.755859 16.575521 19.620768 16.775717 19.448242 16.948242 C 19.275715 17.120768 19.07552 17.255859 18.847656 17.353516 C 18.619791 17.451172 18.378906 17.5 18.125 17.5 Z M 5 16.25 L 5 14.375 C 5 14.121094 5.048828 13.880209 5.146484 13.652344 C 5.244141 13.424479 5.379231 13.224284 5.551758 13.051758 C 5.724284 12.879232 5.924479 12.744141 6.152344 12.646484 C 6.380208 12.548828 6.621094 12.5 6.875 12.5 L 13.125 12.5 C 13.378905 12.5 13.619791 12.548828 13.847656 12.646484 C 14.075521 12.744141 14.275716 12.879232 14.448242 13.051758 C 14.620768 13.224284 14.755858 13.424479 14.853516 13.652344 C 14.951171 13.880209 14.999999 14.121094 15 14.375 L 15 16.25 L 18.125 16.25 C 18.29427 16.25 18.440754 16.188152 18.564453 16.064453 C 18.68815 15.940756 18.75 15.794271 18.75 15.625 L 18.75 4.375 C 18.75 4.20573 18.68815 4.059246 18.564453 3.935547 C 18.440754 3.81185 18.29427 3.75 18.125 3.75 L 1.875 3.75 C 1.705729 3.75 1.559245 3.81185 1.435547 3.935547 C 1.311849 4.059246 1.25 4.20573 1.25 4.375 L 1.25 15.625 C 1.25 15.794271 1.311849 15.940756 1.435547 16.064453 C 1.559245 16.188152 1.705729 16.25 1.875 16.25 Z M 6.875 8.056641 C 6.875 7.633464 6.959635 7.236328 7.128906 6.865234 C 7.298177 6.494141 7.526041 6.170248 7.8125 5.893555 C 8.098958 5.616862 8.430989 5.398764 8.808594 5.239258 C 9.186197 5.079754 9.583333 5.000001 10 5 C 10.436197 5.000001 10.843099 5.081381 11.220703 5.244141 C 11.598307 5.406901 11.928711 5.629883 12.211914 5.913086 C 12.495117 6.196289 12.718099 6.526693 12.880859 6.904297 C 13.043619 7.281901 13.124999 7.688803 13.125 8.125 C 13.124999 8.561198 13.043619 8.9681 12.880859 9.345703 C 12.718099 9.723308 12.495117 10.053711 12.211914 10.336914 C 11.928711 10.620117 11.598307 10.8431 11.220703 11.005859 C 10.843099 11.16862 10.436197 11.25 10 11.25 C 9.550781 11.25 9.135742 11.166992 8.754883 11.000977 C 8.374023 10.834961 8.043619 10.607097 7.763672 10.317383 C 7.483724 10.02767 7.265625 9.689128 7.109375 9.301758 C 6.953125 8.914389 6.875 8.49935 6.875 8.056641 Z M 11.875 8.125 C 11.875 7.871094 11.826172 7.630209 11.728516 7.402344 C 11.630859 7.174479 11.495768 6.974284 11.323242 6.801758 C 11.150716 6.629232 10.950521 6.494141 10.722656 6.396484 C 10.494791 6.298828 10.253906 6.25 10 6.25 C 9.746094 6.25 9.505208 6.298828 9.277344 6.396484 C 9.049479 6.494141 8.849283 6.629232 8.676758 6.801758 C 8.504231 6.974284 8.369141 7.174479 8.271484 7.402344 C 8.173828 7.630209 8.125 7.871094 8.125 8.125 C 8.125 8.378906 8.173828 8.619792 8.271484 8.847656 C 8.369141 9.075521 8.504231 9.275717 8.676758 9.448242 C 8.849283 9.620769 9.049479 9.755859 9.277344 9.853516 C 9.505208 9.951172 9.746094 10 10 10 C 10.253906 10 10.494791 9.951172 10.722656 9.853516 C 10.950521 9.755859 11.150716 9.620769 11.323242 9.448242 C 11.495768 9.275717 11.630859 9.075521 11.728516 8.847656 C 11.826172 8.619792 11.875 8.378906 11.875 8.125 Z M 6.25 16.25 L 13.75 16.25 L 13.75 14.375 C 13.75 14.205729 13.68815 14.059245 13.564453 13.935547 C 13.440755 13.81185 13.294271 13.75 13.125 13.75 L 6.875 13.75 C 6.705729 13.75 6.559244 13.81185 6.435547 13.935547 C 6.311849 14.059245 6.25 14.205729 6.25 14.375 Z " />
-                </VisualState.Setters>
-            </VisualState>-->
-
-            <VisualState x:Name="FetchingEvents">
-                <VisualState.Setters>
-                    <Setter Target="CancelButton.Visibility" Value="Collapsed" />
-                    <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.AccountCreationDialog_FetchingEvents}" />
-                    <!--<Setter Target="DialogIcon.Data" Value="F1 M 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 15.078125 C 18.75 15.566406 18.650715 16.033529 18.452148 16.479492 C 18.25358 16.925455 17.986652 17.31608 17.651367 17.651367 C 17.31608 17.986654 16.925455 18.25358 16.479492 18.452148 C 16.033527 18.650717 15.566406 18.75 15.078125 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 Z M 4.951172 2.5 C 4.619141 2.5 4.303385 2.568359 4.003906 2.705078 C 3.704427 2.841797 3.44401 3.02409 3.222656 3.251953 C 3.001302 3.479818 2.825521 3.745117 2.695312 4.047852 C 2.565104 4.350587 2.5 4.66797 2.5 5 L 17.5 5 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 Z M 15.048828 17.5 C 15.374349 17.5 15.685221 17.433268 15.981445 17.299805 C 16.277668 17.166342 16.538086 16.987305 16.762695 16.762695 C 16.987305 16.538086 17.16634 16.27767 17.299805 15.981445 C 17.433268 15.685222 17.5 15.37435 17.5 15.048828 L 17.5 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.37435 2.566732 15.685222 2.700195 15.981445 C 2.833659 16.27767 3.012695 16.538086 3.237305 16.762695 C 3.461914 16.987305 3.722331 17.166342 4.018555 17.299805 C 4.314778 17.433268 4.625651 17.5 4.951172 17.5 Z M 5 10 C 5 9.824219 5.032552 9.661459 5.097656 9.511719 C 5.16276 9.361979 5.252278 9.230144 5.366211 9.116211 C 5.480143 9.002279 5.613606 8.912761 5.766602 8.847656 C 5.919596 8.782553 6.083984 8.75 6.259766 8.75 C 6.435547 8.75 6.598307 8.782553 6.748047 8.847656 C 6.897786 8.912761 7.027994 9.000651 7.138672 9.111328 C 7.249349 9.222006 7.337239 9.352214 7.402344 9.501953 C 7.467447 9.651693 7.5 9.814453 7.5 9.990234 C 7.5 10.166016 7.467447 10.330404 7.402344 10.483398 C 7.337239 10.636394 7.247721 10.769857 7.133789 10.883789 C 7.019856 10.997722 6.888021 11.08724 6.738281 11.152344 C 6.588542 11.217448 6.425781 11.25 6.25 11.25 C 6.074219 11.25 5.909831 11.217448 5.756836 11.152344 C 5.603841 11.08724 5.472005 10.99935 5.361328 10.888672 C 5.250651 10.777995 5.16276 10.646159 5.097656 10.493164 C 5.032552 10.34017 5 10.175781 5 10 Z M 8.75 10 C 8.75 9.824219 8.782552 9.661459 8.847656 9.511719 C 8.91276 9.361979 9.002278 9.230144 9.116211 9.116211 C 9.230143 9.002279 9.363606 8.912761 9.516602 8.847656 C 9.669596 8.782553 9.833984 8.75 10.009766 8.75 C 10.185547 8.75 10.348307 8.782553 10.498047 8.847656 C 10.647786 8.912761 10.777994 9.000651 10.888672 9.111328 C 10.999349 9.222006 11.087239 9.352214 11.152344 9.501953 C 11.217447 9.651693 11.25 9.814453 11.25 9.990234 C 11.25 10.166016 11.217447 10.330404 11.152344 10.483398 C 11.087239 10.636394 10.997721 10.769857 10.883789 10.883789 C 10.769856 10.997722 10.638021 11.08724 10.488281 11.152344 C 10.338541 11.217448 10.175781 11.25 10 11.25 C 9.824219 11.25 9.65983 11.217448 9.506836 11.152344 C 9.353841 11.08724 9.222005 10.99935 9.111328 10.888672 C 9.00065 10.777995 8.91276 10.646159 8.847656 10.493164 C 8.782552 10.34017 8.75 10.175781 8.75 10 Z M 15 9.990234 C 14.999999 10.166016 14.967447 10.330404 14.902344 10.483398 C 14.837239 10.636394 14.747721 10.769857 14.633789 10.883789 C 14.519856 10.997722 14.388021 11.08724 14.238281 11.152344 C 14.088541 11.217448 13.925781 11.25 13.75 11.25 C 13.574219 11.25 13.40983 11.217448 13.256836 11.152344 C 13.103841 11.08724 12.972005 10.99935 12.861328 10.888672 C 12.75065 10.777995 12.66276 10.646159 12.597656 10.493164 C 12.532552 10.34017 12.5 10.175781 12.5 10 C 12.5 9.824219 12.532552 9.661459 12.597656 9.511719 C 12.66276 9.361979 12.752278 9.230144 12.866211 9.116211 C 12.980143 9.002279 13.113605 8.912761 13.266602 8.847656 C 13.419596 8.782553 13.583984 8.75 13.759766 8.75 C 13.935547 8.75 14.098307 8.782553 14.248047 8.847656 C 14.397785 8.912761 14.527994 9.000651 14.638672 9.111328 C 14.749349 9.222006 14.837239 9.352214 14.902344 9.501953 C 14.967447 9.651693 14.999999 9.814453 15 9.990234 Z M 7.5 13.75 C 7.5 13.925781 7.467447 14.088542 7.402344 14.238281 C 7.337239 14.388021 7.247721 14.519857 7.133789 14.633789 C 7.019856 14.747722 6.886393 14.83724 6.733398 14.902344 C 6.580403 14.967448 6.416015 15 6.240234 15 C 6.064453 15 5.901692 14.967448 5.751953 14.902344 C 5.602213 14.83724 5.472005 14.74935 5.361328 14.638672 C 5.250651 14.527995 5.16276 14.397787 5.097656 14.248047 C 5.032552 14.098308 5 13.935547 5 13.759766 C 5 13.583984 5.032552 13.419597 5.097656 13.266602 C 5.16276 13.113607 5.252278 12.980144 5.366211 12.866211 C 5.480143 12.752279 5.611979 12.662761 5.761719 12.597656 C 5.911458 12.532553 6.074219 12.5 6.25 12.5 C 6.425781 12.5 6.590169 12.532553 6.743164 12.597656 C 6.896158 12.662761 7.027994 12.750651 7.138672 12.861328 C 7.249349 12.972006 7.337239 13.103842 7.402344 13.256836 C 7.467447 13.409831 7.5 13.574219 7.5 13.75 Z M 11.25 13.75 C 11.25 13.925781 11.217447 14.088542 11.152344 14.238281 C 11.087239 14.388021 10.997721 14.519857 10.883789 14.633789 C 10.769856 14.747722 10.636393 14.83724 10.483398 14.902344 C 10.330403 14.967448 10.166016 15 9.990234 15 C 9.814453 15 9.651692 14.967448 9.501953 14.902344 C 9.352213 14.83724 9.222005 14.74935 9.111328 14.638672 C 9.00065 14.527995 8.91276 14.397787 8.847656 14.248047 C 8.782552 14.098308 8.75 13.935547 8.75 13.759766 C 8.75 13.583984 8.782552 13.419597 8.847656 13.266602 C 8.91276 13.113607 9.002278 12.980144 9.116211 12.866211 C 9.230143 12.752279 9.361979 12.662761 9.511719 12.597656 C 9.661458 12.532553 9.824219 12.5 10 12.5 C 10.175781 12.5 10.340169 12.532553 10.493164 12.597656 C 10.646158 12.662761 10.777994 12.750651 10.888672 12.861328 C 10.999349 12.972006 11.087239 13.103842 11.152344 13.256836 C 11.217447 13.409831 11.25 13.574219 11.25 13.75 Z " />-->
-                </VisualState.Setters>
-            </VisualState>
-
-            <!--<VisualState x:Name="Completed">
-                <VisualState.Setters>
-                    <Setter Target="CancelButton.Visibility" Value="Collapsed" />
-                    <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.AccountCreationDialog_Completed}" />
-                </VisualState.Setters>
-            </VisualState>-->
-
-            <VisualState x:Name="Idle" />
-        </VisualStateGroup>
-    </VisualStateManager.VisualStateGroups>
-</dialogs:BaseAccountCreationDialog>
+</ContentDialog>
diff --git a/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml.cs b/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml.cs
index 49de0bb4..3abb5897 100644
--- a/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml.cs
+++ b/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml.cs
@@ -1,50 +1,58 @@
-using System;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.DependencyInjection;
+using System.Threading;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP;
-using Wino.Messaging.UI;
 
 namespace Wino.Dialogs
 {
-    public sealed partial class AccountCreationDialog : BaseAccountCreationDialog, IRecipient<CopyAuthURLRequested>
+    public sealed partial class AccountCreationDialog : ContentDialog, IAccountCreationDialog
     {
-        private string copyClipboardURL;
+        public CancellationTokenSource CancellationTokenSource { get; private set; }
+
+        public AccountCreationDialogState State
+        {
+            get { return (AccountCreationDialogState)GetValue(StateProperty); }
+            set { SetValue(StateProperty, value); }
+        }
+
+        public static readonly DependencyProperty StateProperty = DependencyProperty.Register(nameof(State), typeof(AccountCreationDialogState), typeof(AccountCreationDialog), new PropertyMetadata(AccountCreationDialogState.Idle));
+
         public AccountCreationDialog()
         {
             InitializeComponent();
-
-            WeakReferenceMessenger.Default.Register(this);
         }
 
-        public override void OnStateChanged(AccountCreationDialogState state)
+        // Prevent users from dismissing it by ESC key.
+        public void DialogClosing(ContentDialog sender, ContentDialogClosingEventArgs args)
         {
-            var tt = VisualStateManager.GoToState(this, state.ToString(), true);
-        }
-
-        public async void Receive(CopyAuthURLRequested message)
-        {
-            copyClipboardURL = message.AuthURL;
-
-            await Task.Delay(2000);
-
-            await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+            if (args.Result == ContentDialogResult.None)
             {
-                AuthHelpDialogButton.Visibility = Windows.UI.Xaml.Visibility.Visible;
-            });
+                args.Cancel = true;
+            }
         }
 
-        private void CancelClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e) => Complete(true);
-
-        private async void CopyClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        public void ShowDialog(CancellationTokenSource cancellationTokenSource)
         {
-            if (string.IsNullOrEmpty(copyClipboardURL)) return;
+            CancellationTokenSource = cancellationTokenSource;
 
-            var clipboardService = WinoApplication.Current.Services.GetService<IClipboardService>();
-            await clipboardService.CopyClipboardAsync(copyClipboardURL);
+            _ = ShowAsync();
         }
+
+        public void Complete(bool cancel)
+        {
+            State = cancel ? AccountCreationDialogState.Canceled : AccountCreationDialogState.Completed;
+
+            // Unregister from closing event.
+            Closing -= DialogClosing;
+
+            if (cancel && !CancellationTokenSource.IsCancellationRequested)
+            {
+                CancellationTokenSource.Cancel();
+            }
+
+            Hide();
+        }
+        private void CancelClicked(object sender, System.EventArgs e) => Complete(true);
     }
 }
diff --git a/Wino.Core.UWP/Dialogs/BaseAccountCreationDialog.cs b/Wino.Core.UWP/Dialogs/BaseAccountCreationDialog.cs
deleted file mode 100644
index f27abb2a..00000000
--- a/Wino.Core.UWP/Dialogs/BaseAccountCreationDialog.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System.Threading;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Dialogs
-{
-    public abstract class BaseAccountCreationDialog : ContentDialog, IAccountCreationDialog
-    {
-        public AccountCreationDialogState State
-        {
-            get { return (AccountCreationDialogState)GetValue(StateProperty); }
-            set { SetValue(StateProperty, value); }
-        }
-
-        public CancellationTokenSource CancellationTokenSource { get; private set; }
-
-        public static readonly DependencyProperty StateProperty = DependencyProperty.Register(nameof(State), typeof(AccountCreationDialogState), typeof(BaseAccountCreationDialog), new PropertyMetadata(AccountCreationDialogState.Idle, OnStateChanged));
-
-        private static void OnStateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var dialog = d as BaseAccountCreationDialog;
-            dialog.OnStateChanged((AccountCreationDialogState)e.NewValue);
-        }
-
-        public abstract void OnStateChanged(AccountCreationDialogState state);
-
-        // Prevent users from dismissing it by ESC key.
-        public void DialogClosing(ContentDialog sender, ContentDialogClosingEventArgs args)
-        {
-            if (args.Result == ContentDialogResult.None)
-            {
-                args.Cancel = true;
-            }
-        }
-
-        public void ShowDialog(CancellationTokenSource cancellationTokenSource)
-        {
-            CancellationTokenSource = cancellationTokenSource;
-
-            _ = ShowAsync();
-        }
-
-        public void Complete(bool cancel)
-        {
-            State = cancel ? AccountCreationDialogState.Canceled : AccountCreationDialogState.Completed;
-
-            // Unregister from closing event.
-            Closing -= DialogClosing;
-
-            if (cancel && !CancellationTokenSource.IsCancellationRequested)
-            {
-                CancellationTokenSource.Cancel();
-            }
-
-            Hide();
-        }
-    }
-}
diff --git a/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml b/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml
index 163c6cc9..b53453f4 100644
--- a/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml
+++ b/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml
@@ -85,6 +85,7 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
 
@@ -103,20 +104,27 @@
                 Source="{x:Bind SelectedMailProvider.ProviderImage, Mode=OneWay}" />
 
             <TextBox
-                x:Name="SpecialImapAddress"
+                x:Name="DisplayNameTextBox"
                 Grid.Row="1"
-                TextChanged="InputChanged"
+                Header="Display Name"
+                PlaceholderText="eg. John Doe"
+                TextChanged="InputChanged" />
+
+            <TextBox
+                x:Name="SpecialImapAddress"
+                Grid.Row="2"
                 Header="E-mail Address"
-                PlaceholderText="eg. johndoe@testmail.com" />
+                PlaceholderText="eg. johndoe@testmail.com"
+                TextChanged="InputChanged" />
 
             <PasswordBox
                 x:Name="AppSpecificPassword"
-                PasswordChanged="ImapPasswordChanged"
-                Grid.Row="2"
-                Header="App-Specific Password" />
+                Grid.Row="3"
+                Header="App-Specific Password"
+                PasswordChanged="ImapPasswordChanged" />
 
             <HyperlinkButton
-                Grid.Row="3"
+                Grid.Row="4"
                 HorizontalAlignment="Right"
                 Click="AppSpecificHelpButtonClicked"
                 Content="How do I get app-specific password?" />
diff --git a/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml.cs b/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml.cs
index eddada87..9ba9efca 100644
--- a/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml.cs
+++ b/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml.cs
@@ -21,6 +21,7 @@ namespace Wino.Core.UWP.Dialogs
         public static readonly DependencyProperty IsSpecialImapServerPartVisibleProperty = DependencyProperty.Register(nameof(IsSpecialImapServerPartVisible), typeof(bool), typeof(NewAccountDialog), new PropertyMetadata(false));
         public static readonly DependencyProperty SelectedMailProviderProperty = DependencyProperty.Register(nameof(SelectedMailProvider), typeof(ProviderDetail), typeof(NewAccountDialog), new PropertyMetadata(null, new PropertyChangedCallback(OnSelectedProviderChanged)));
 
+
         /// <summary>
         /// Gets or sets current selected mail provider in the dialog.
         /// </summary>
@@ -69,6 +70,17 @@ namespace Wino.Core.UWP.Dialogs
 
         private void CreateClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
         {
+            if (IsSpecialImapServerPartVisible)
+            {
+                // Special imap detail input.
+
+                var details = new SpecialImapProviderDetails(SpecialImapAddress.Text.Trim(), AppSpecificPassword.Password.Trim(), DisplayNameTextBox.Text.Trim(), SelectedMailProvider.SpecialImapProvider);
+                Result = new AccountCreationDialogResult(SelectedMailProvider.Type, AccountNameTextbox.Text.Trim(), details);
+                Hide();
+
+                return;
+            }
+
             Validate();
 
             if (IsSecondaryButtonEnabled)
@@ -85,7 +97,7 @@ namespace Wino.Core.UWP.Dialogs
                 }
                 else
                 {
-                    Result = new AccountCreationDialogResult(SelectedMailProvider.Type, AccountNameTextbox.Text.Trim());
+                    Result = new AccountCreationDialogResult(SelectedMailProvider.Type, AccountNameTextbox.Text.Trim(), null);
                     Hide();
                 }
             }
@@ -106,7 +118,9 @@ namespace Wino.Core.UWP.Dialogs
             bool shouldEnable = SelectedMailProvider != null
                 && SelectedMailProvider.IsSupported
                 && !string.IsNullOrEmpty(AccountNameTextbox.Text)
-                && (IsSpecialImapServerPartVisible ? (!string.IsNullOrEmpty(AppSpecificPassword.Password) && EmailValidation.EmailValidator.Validate(SpecialImapAddress.Text)) : true);
+                && (IsSpecialImapServerPartVisible ? (!string.IsNullOrEmpty(AppSpecificPassword.Password)
+                && !string.IsNullOrEmpty(DisplayNameTextBox.Text)
+                && EmailValidation.EmailValidator.Validate(SpecialImapAddress.Text)) : true);
 
             IsPrimaryButtonEnabled = shouldEnable;
         }
diff --git a/Wino.Core.UWP/Services/DialogServiceBase.cs b/Wino.Core.UWP/Services/DialogServiceBase.cs
index bec6852d..46fb1be7 100644
--- a/Wino.Core.UWP/Services/DialogServiceBase.cs
+++ b/Wino.Core.UWP/Services/DialogServiceBase.cs
@@ -132,7 +132,7 @@ namespace Wino.Core.UWP.Services
             return file;
         }
 
-        public virtual IAccountCreationDialog GetAccountCreationDialog(MailProviderType type)
+        public virtual IAccountCreationDialog GetAccountCreationDialog(AccountCreationDialogResult accountCreationDialogResult)
         {
             return new AccountCreationDialog
             {
diff --git a/Wino.Core.UWP/Wino.Core.UWP.csproj b/Wino.Core.UWP/Wino.Core.UWP.csproj
index 11de7603..0e4f1e73 100644
--- a/Wino.Core.UWP/Wino.Core.UWP.csproj
+++ b/Wino.Core.UWP/Wino.Core.UWP.csproj
@@ -84,6 +84,9 @@
   <ItemGroup>
     <Compile Include="Activation\ActivationHandler.cs" />
     <Compile Include="BasePage.cs" />
+    <Compile Include="Controls\AccountCreationDialogControl.xaml.cs">
+      <DependentUpon>AccountCreationDialogControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\ControlConstants.cs" />
     <Compile Include="Controls\CustomWrapPanel.cs" />
     <Compile Include="Controls\EqualGridPanel.cs" />
@@ -115,7 +118,6 @@
     <Compile Include="Dialogs\AccountPickerDialog.xaml.cs">
       <DependentUpon>AccountPickerDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Dialogs\BaseAccountCreationDialog.cs" />
     <Compile Include="Dialogs\CustomMessageDialogInformationContainer.cs" />
     <Compile Include="Dialogs\CustomThemeBuilderDialog.xaml.cs">
       <DependentUpon>CustomThemeBuilderDialog.xaml</DependentUpon>
@@ -341,6 +343,10 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <Page Include="Controls\AccountCreationDialogControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Controls\WinoAppTitleBar.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Wino.Core/Synchronizers/ImapSynchronizer.cs b/Wino.Core/Synchronizers/ImapSynchronizer.cs
index 0a3a94e2..25e92b84 100644
--- a/Wino.Core/Synchronizers/ImapSynchronizer.cs
+++ b/Wino.Core/Synchronizers/ImapSynchronizer.cs
@@ -626,13 +626,21 @@ namespace Wino.Core.Synchronizers.Mail
 
             IImapClient availableClient = null;
 
+        retry:
             try
             {
+
                 availableClient = await _clientPool.GetClientAsync().ConfigureAwait(false);
 
                 var strategy = _imapSynchronizationStrategyProvider.GetSynchronizationStrategy(availableClient);
                 return await strategy.HandleSynchronizationAsync(availableClient, folder, this, cancellationToken).ConfigureAwait(false);
             }
+            catch (IOException)
+            {
+                _clientPool.Release(availableClient, false);
+
+                goto retry;
+            }
             catch (Exception)
             {
 
diff --git a/Wino.Mail.ViewModels/AccountManagementViewModel.cs b/Wino.Mail.ViewModels/AccountManagementViewModel.cs
index e5769bd2..834ecb24 100644
--- a/Wino.Mail.ViewModels/AccountManagementViewModel.cs
+++ b/Wino.Mail.ViewModels/AccountManagementViewModel.cs
@@ -28,18 +28,25 @@ namespace Wino.Mail.ViewModels
 {
     public partial class AccountManagementViewModel : AccountManagementPageViewModelBase
     {
+        private readonly ISpecialImapProviderConfigResolver _specialImapProviderConfigResolver;
+        private readonly IImapTestService _imapTestService;
+
         public IMailDialogService MailDialogService { get; }
 
         public AccountManagementViewModel(IMailDialogService dialogService,
                                           IWinoServerConnectionManager winoServerConnectionManager,
                                           INavigationService navigationService,
                                           IAccountService accountService,
+                                          ISpecialImapProviderConfigResolver specialImapProviderConfigResolver,
                                           IProviderService providerService,
+                                          IImapTestService imapTestService,
                                           IStoreManagementService storeManagementService,
                                           IAuthenticationProvider authenticationProvider,
                                           IPreferencesService preferencesService) : base(dialogService, winoServerConnectionManager, navigationService, accountService, providerService, storeManagementService, authenticationProvider, preferencesService)
         {
             MailDialogService = dialogService;
+            _specialImapProviderConfigResolver = specialImapProviderConfigResolver;
+            _imapTestService = imapTestService;
         }
 
         [RelayCommand]
@@ -93,7 +100,7 @@ namespace Wino.Mail.ViewModels
 
                 if (accountCreationDialogResult != null)
                 {
-                    creationDialog = MailDialogService.GetAccountCreationDialog(accountCreationDialogResult.ProviderType);
+                    creationDialog = MailDialogService.GetAccountCreationDialog(accountCreationDialogResult);
 
                     CustomServerInformation customServerInformation = null;
 
@@ -101,17 +108,20 @@ namespace Wino.Mail.ViewModels
                     {
                         ProviderType = accountCreationDialogResult.ProviderType,
                         Name = accountCreationDialogResult.AccountName,
-                        AccountColorHex = accountCreationDialogResult.AccountColorHex,
+                        SpecialImapProvider = accountCreationDialogResult.SpecialImapProviderDetails?.SpecialImapProvider ?? SpecialImapProvider.None,
                         Id = Guid.NewGuid()
                     };
 
                     creationDialog.ShowDialog(accountCreationCancellationTokenSource);
+
+                    await Task.Delay(1000);
+
                     creationDialog.State = AccountCreationDialogState.SigningIn;
 
                     string tokenInformation = string.Empty;
 
                     // Custom server implementation requires more async waiting.
-                    if (creationDialog is ICustomServerAccountCreationDialog customServerDialog)
+                    if (creationDialog is IImapAccountCreationDialog customServerDialog)
                     {
                         // Pass along the account properties and perform initial navigation on the imap frame.
                         customServerDialog.StartImapConnectionSetup(createdAccount);
@@ -130,20 +140,35 @@ namespace Wino.Mail.ViewModels
                     }
                     else
                     {
-                        // OAuth authentication is handled here.
-                        // Server authenticates, returns the token info here.
+                        if (accountCreationDialogResult.SpecialImapProviderDetails != null)
+                        {
+                            createdAccount.SenderName = accountCreationDialogResult.SpecialImapProviderDetails.SenderName;
+                            createdAccount.Address = customServerInformation.Address;
 
-                        var tokenInformationResponse = await WinoServerConnectionManager
-                            .GetResponseAsync<TokenInformationEx, AuthorizationRequested>(new AuthorizationRequested(accountCreationDialogResult.ProviderType,
-                                                                                                                   createdAccount,
-                                                                                                                   createdAccount.ProviderType == MailProviderType.Gmail), accountCreationCancellationTokenSource.Token);
+                            // Special imap provider testing dialog. This is only available for iCloud and Yahoo.
+                            customServerInformation = _specialImapProviderConfigResolver.GetServerInformation(createdAccount, accountCreationDialogResult);
+                            customServerInformation.Id = Guid.NewGuid();
+                            customServerInformation.AccountId = createdAccount.Id;
 
-                        if (creationDialog.State == AccountCreationDialogState.Canceled)
-                            throw new AccountSetupCanceledException();
+                            await _imapTestService.TestImapConnectionAsync(customServerInformation, true);
+                        }
+                        else
+                        {
+                            // OAuth authentication is handled here.
+                            // Server authenticates, returns the token info here.
 
-                        createdAccount.Address = tokenInformationResponse.Data.AccountAddress;
+                            var tokenInformationResponse = await WinoServerConnectionManager
+                                .GetResponseAsync<TokenInformationEx, AuthorizationRequested>(new AuthorizationRequested(accountCreationDialogResult.ProviderType,
+                                                                                                                       createdAccount,
+                                                                                                                       createdAccount.ProviderType == MailProviderType.Gmail), accountCreationCancellationTokenSource.Token);
 
-                        tokenInformationResponse.ThrowIfFailed();
+                            if (creationDialog.State == AccountCreationDialogState.Canceled)
+                                throw new AccountSetupCanceledException();
+
+                            createdAccount.Address = tokenInformationResponse.Data.AccountAddress;
+
+                            tokenInformationResponse.ThrowIfFailed();
+                        }
                     }
 
                     // Address is still doesn't have a value for API synchronizers.
@@ -183,7 +208,7 @@ namespace Wino.Mail.ViewModels
                         await AccountService.UpdateProfileInformationAsync(createdAccount.Id, profileSynchronizationResult.ProfileInformation);
                     }
 
-                    if (creationDialog is ICustomServerAccountCreationDialog customServerAccountCreationDialog)
+                    if (creationDialog is IImapAccountCreationDialog customServerAccountCreationDialog)
                         customServerAccountCreationDialog.ShowPreparingFolders();
                     else
                         creationDialog.State = AccountCreationDialogState.PreparingFolders;
@@ -227,14 +252,6 @@ namespace Wino.Mail.ViewModels
                         await AccountService.CreateRootAliasAsync(createdAccount.Id, createdAccount.Address);
                     }
 
-                    // TODO: Temporary disabled. Is this even needed? Users can configure special folders manually later on if discovery fails.
-                    // Check if Inbox folder is available for the account after synchronization.
-
-                    //var isInboxAvailable = await _folderService.IsInboxAvailableForAccountAsync(createdAccount.Id);
-
-                    //if (!isInboxAvailable)
-                    //    throw new Exception(Translator.Exception_InboxNotAvailable);
-
                     // Send changes to listeners.
                     ReportUIChange(new AccountCreatedMessage(createdAccount));
 
@@ -250,6 +267,10 @@ namespace Wino.Mail.ViewModels
             {
                 // Ignore
             }
+            catch (ImapClientPoolException clientPoolException)
+            {
+                DialogService.InfoBarMessage(Translator.Info_AccountCreationFailedTitle, clientPoolException.InnerException.Message, InfoBarMessageType.Error);
+            }
             catch (Exception ex)
             {
                 Log.Error(ex, WinoErrors.AccountCreation);
diff --git a/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs b/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs
index 34453f7f..bd2d907f 100644
--- a/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs
@@ -7,6 +7,7 @@ using Windows.UI.Xaml.Media.Animation;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
 using Wino.Messaging.Client.Mails;
 using Wino.Views.ImapSetup;
 
@@ -24,7 +25,7 @@ namespace Wino.Dialogs
         IRecipient<ImapSetupNavigationRequested>,
         IRecipient<ImapSetupBackNavigationRequested>,
         IRecipient<ImapSetupDismissRequested>,
-        ICustomServerAccountCreationDialog
+        IImapAccountCreationDialog
     {
         private TaskCompletionSource<CustomServerInformation> _getServerInfoTaskCompletionSource = new TaskCompletionSource<CustomServerInformation>();
 
@@ -86,7 +87,7 @@ namespace Wino.Dialogs
         }
 
         public void StartImapConnectionSetup(MailAccount account) => ImapFrame.Navigate(typeof(WelcomeImapSetupPage), account, new DrillInNavigationTransitionInfo());
-
+        public void StartImapConnectionSetup(AccountCreationDialogResult accountCreationDialogResult) => ImapFrame.Navigate(typeof(WelcomeImapSetupPage), accountCreationDialogResult, new DrillInNavigationTransitionInfo());
 
         private void ImapSetupDialogClosed(ContentDialog sender, ContentDialogClosedEventArgs args) => WeakReferenceMessenger.Default.UnregisterAll(this);
 
diff --git a/Wino.Mail/Services/DialogService.cs b/Wino.Mail/Services/DialogService.cs
index 1a419969..93dba62a 100644
--- a/Wino.Mail/Services/DialogService.cs
+++ b/Wino.Mail/Services/DialogService.cs
@@ -10,6 +10,7 @@ using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.Synchronization;
 using Wino.Core.UWP.Extensions;
@@ -29,18 +30,27 @@ namespace Wino.Services
 
         }
 
-        public override IAccountCreationDialog GetAccountCreationDialog(MailProviderType type)
+        public override IAccountCreationDialog GetAccountCreationDialog(AccountCreationDialogResult accountCreationDialogResult)
         {
-            if (type == MailProviderType.IMAP4)
+            if (accountCreationDialogResult.SpecialImapProviderDetails == null)
             {
-                return new NewImapSetupDialog
+                if (accountCreationDialogResult.ProviderType == MailProviderType.IMAP4)
                 {
-                    RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
-                };
+                    return new NewImapSetupDialog
+                    {
+                        RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
+                    };
+                }
+                else
+                {
+                    return base.GetAccountCreationDialog(accountCreationDialogResult);
+                }
             }
             else
             {
-                return base.GetAccountCreationDialog(type);
+                // Special IMAP provider like iCloud or Yahoo.
+
+                return base.GetAccountCreationDialog(accountCreationDialogResult);
             }
         }
 
diff --git a/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs b/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
index 922d91eb..a4491da5 100644
--- a/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
+++ b/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
@@ -9,6 +9,7 @@ using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.Domain.Models.AutoDiscovery;
 using Wino.Messaging.Client.Mails;
 
@@ -35,6 +36,10 @@ namespace Wino.Views.ImapSetup
             {
                 DisplayNameBox.Text = accountProperties.Name;
             }
+            else if (e.Parameter is AccountCreationDialogResult creationDialogResult)
+            {
+                WeakReferenceMessenger.Default.Send(new ImapSetupNavigationRequested(typeof(TestingImapConnectionPage), creationDialogResult));
+            }
         }
 
         private async void SignInClicked(object sender, RoutedEventArgs e)
diff --git a/Wino.Services/ServicesContainerSetup.cs b/Wino.Services/ServicesContainerSetup.cs
index 245a8a4f..89bf8b33 100644
--- a/Wino.Services/ServicesContainerSetup.cs
+++ b/Wino.Services/ServicesContainerSetup.cs
@@ -23,6 +23,7 @@ namespace Wino.Services
             services.AddTransient<IContactService, ContactService>();
             services.AddTransient<ISignatureService, SignatureService>();
             services.AddTransient<IContextMenuItemService, ContextMenuItemService>();
+            services.AddTransient<ISpecialImapProviderConfigResolver, SpecialImapProviderConfigResolver>();
 
             services.AddSingleton<IThreadingStrategyProvider, ThreadingStrategyProvider>();
             services.AddTransient<IOutlookThreadingStrategy, OutlookThreadingStrategy>();
diff --git a/Wino.Services/SpecialImapProviderConfigResolver.cs b/Wino.Services/SpecialImapProviderConfigResolver.cs
new file mode 100644
index 00000000..b2da4e99
--- /dev/null
+++ b/Wino.Services/SpecialImapProviderConfigResolver.cs
@@ -0,0 +1,46 @@
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+
+namespace Wino.Services
+{
+    public class SpecialImapProviderConfigResolver : ISpecialImapProviderConfigResolver
+    {
+        private readonly CustomServerInformation iCloudServerConfig = new CustomServerInformation()
+        {
+            IncomingServer = "imap.mail.me.com",
+            IncomingServerPort = "993",
+            IncomingServerType = CustomIncomingServerType.IMAP4,
+            IncomingServerSocketOption = ImapConnectionSecurity.Auto,
+            IncomingAuthenticationMethod = ImapAuthenticationMethod.Auto,
+            OutgoingServer = "smtp.mail.me.com",
+            OutgoingServerPort = "587",
+            OutgoingServerSocketOption = ImapConnectionSecurity.Auto,
+            OutgoingAuthenticationMethod = ImapAuthenticationMethod.Auto,
+            MaxConcurrentClients = 5,
+        };
+
+
+        public CustomServerInformation GetServerInformation(MailAccount account, AccountCreationDialogResult dialogResult)
+        {
+            CustomServerInformation resolvedConfig = null;
+
+            if (dialogResult.SpecialImapProviderDetails.SpecialImapProvider == SpecialImapProvider.iCloud)
+            {
+                resolvedConfig = iCloudServerConfig;
+
+                // iCloud takes username before the @icloud part for incoming, but full address as outgoing.
+                resolvedConfig.IncomingServerUsername = dialogResult.SpecialImapProviderDetails.Address.Split('@')[0];
+                resolvedConfig.OutgoingServerUsername = dialogResult.SpecialImapProviderDetails.Address;
+            }
+
+            // Fill in account details.
+            resolvedConfig.Address = dialogResult.SpecialImapProviderDetails.Address;
+            resolvedConfig.IncomingServerPassword = dialogResult.SpecialImapProviderDetails.Password;
+            resolvedConfig.OutgoingServerPassword = dialogResult.SpecialImapProviderDetails.Password;
+            resolvedConfig.DisplayName = dialogResult.SpecialImapProviderDetails.SenderName;
+            return resolvedConfig;
+        }
+    }
+}