diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index 794743037..2fd0761b2 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -36,13 +36,17 @@
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
-    <AndroidLinkSkip>Xamarin.GooglePlayServices.Gcm;BitwardenAndroid;BitwardenApp;Microsoft.Practices.Unity;SQLite-net</AndroidLinkSkip>
+    <AndroidLinkSkip>Xamarin.GooglePlayServices.Gcm;BitwardenAndroid;BitwardenApp;Microsoft.Practices.Unity;SQLite-net;Xamarin.Android.Net</AndroidLinkSkip>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
     <BundleAssemblies>False</BundleAssemblies>
     <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
     <Debugger>Xamarin</Debugger>
     <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
+    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
+    <AotAssemblies>False</AotAssemblies>
+    <EnableLLVM>False</EnableLLVM>
+    <EnableProguard>False</EnableProguard>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -63,7 +67,7 @@
     <EnableProguard>False</EnableProguard>
     <DebugSymbols>False</DebugSymbols>
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
-    <AndroidLinkSkip>PushNotification.Plugin;PushNotification.Plugin.Abstractions;Xamarin.GooglePlayServices.Base;Xamarin.GooglePlayServices.Basement;Xamarin.GooglePlayServices.Measurement;Xamarin.GooglePlayServices.Gcm;BitwardenAndroid;BitwardenApp;Microsoft.Practices.Unity;SQLite-net</AndroidLinkSkip>
+    <AndroidLinkSkip>PushNotification.Plugin;PushNotification.Plugin.Abstractions;Xamarin.GooglePlayServices.Base;Xamarin.GooglePlayServices.Basement;Xamarin.GooglePlayServices.Measurement;Xamarin.GooglePlayServices.Gcm;BitwardenAndroid;BitwardenApp;Microsoft.Practices.Unity;SQLite-net;Xamarin.Android.Net</AndroidLinkSkip>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Acr.Support.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -87,7 +91,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="HockeySDK, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -106,20 +110,12 @@
       <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="OkHttp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="PCLCrypto, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d4421c8a4786956c, processorArchitecture=MSIL">
       <HintPath>..\..\packages\PCLCrypto.2.0.147\lib\MonoAndroid23\PCLCrypto.dll</HintPath>
       <Private>True</Private>
@@ -235,19 +231,19 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Analytics, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -718,6 +714,9 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\icon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidEnvironment Include="EnvironmentVariables.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -726,10 +725,10 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
     <Error Condition="!Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
   </Target>
   <Import Project="..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
      Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Android/EnvironmentVariables.txt b/src/Android/EnvironmentVariables.txt
new file mode 100644
index 000000000..cc93b59b8
--- /dev/null
+++ b/src/Android/EnvironmentVariables.txt
@@ -0,0 +1 @@
+XA_HTTP_CLIENT_HANDLER_TYPE=Xamarin.Android.Net.AndroidClientHandler
diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs
index 46d8e2e29..80193de6a 100644
--- a/src/Android/Resources/Resource.Designer.cs
+++ b/src/Android/Resources/Resource.Designer.cs
@@ -183,7 +183,6 @@ namespace Bit.Android
 			global::HockeyApp.Resource.Style.HockeyApp_ButtonStyle = global::Bit.Android.Resource.Style.HockeyApp_ButtonStyle;
 			global::HockeyApp.Resource.Style.HockeyApp_EditTextStyle = global::Bit.Android.Resource.Style.HockeyApp_EditTextStyle;
 			global::HockeyApp.Resource.Style.HockeyApp_SingleLineInputStyle = global::Bit.Android.Resource.Style.HockeyApp_SingleLineInputStyle;
-			global::ModernHttpClient.Resource.String.library_name = global::Bit.Android.Resource.String.library_name;
 			global::PCLCrypto.Resource.String.ApplicationName = global::Bit.Android.Resource.String.ApplicationName;
 			global::PCLCrypto.Resource.String.Hello = global::Bit.Android.Resource.String.Hello;
 			global::Plugin.Fingerprint.Resource.Drawable.fingerprint_white = global::Bit.Android.Resource.Drawable.fingerprint_white;
diff --git a/src/Android/packages.config b/src/Android/packages.config
index 7acacacda..d263bebb2 100644
--- a/src/Android/packages.config
+++ b/src/Android/packages.config
@@ -6,7 +6,6 @@
   <package id="BouncyCastle" version="1.8.1" targetFramework="monoandroid60" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="monoandroid60" />
   <package id="HockeySDK.Xamarin" version="4.1.0" targetFramework="monoandroid60" />
-  <package id="modernhttpclient" version="2.4.2" targetFramework="monoandroid50" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
   <package id="PCLCrypto" version="2.0.147" targetFramework="monoandroid60" />
   <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="monoandroid60" />
@@ -33,7 +32,7 @@
   <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
-  <package id="Xamarin.Forms" version="2.3.3.168" targetFramework="monoandroid60" />
+  <package id="Xamarin.Forms" version="2.3.3.175" targetFramework="monoandroid60" />
   <package id="Xamarin.GooglePlayServices.Analytics" version="29.0.0.2" targetFramework="monoandroid60" />
   <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.2" targetFramework="monoandroid60" />
   <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.2" targetFramework="monoandroid60" />
diff --git a/src/App/App.csproj b/src/App/App.csproj
index 5778ff2e3..02f9f7cb7 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -50,9 +50,6 @@
     <Compile Include="App.cs" />
     <Compile Include="Abstractions\Services\ISecureStorageService.cs" />
     <Compile Include="Abstractions\Services\ISqlService.cs" />
-    <Compile Include="Behaviors\EmailValidationBehavior.cs" />
-    <Compile Include="Behaviors\ConnectivityBehavior.cs" />
-    <Compile Include="Behaviors\RequiredValidationBehavior.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Controls\DismissModalToolBarItem.cs" />
     <Compile Include="Controls\ExtendedEditor.cs" />
@@ -223,10 +220,6 @@
       <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\modernhttpclient.2.4.2\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
@@ -304,15 +297,15 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="XLabs.Ioc, Version=2.0.5782.12218, Culture=neutral, processorArchitecture=MSIL">
@@ -330,12 +323,12 @@
     <Compile Include="Services\PushNotificationListener.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/App/Behaviors/ConnectivityBehavior.cs b/src/App/Behaviors/ConnectivityBehavior.cs
deleted file mode 100644
index c11e9480d..000000000
--- a/src/App/Behaviors/ConnectivityBehavior.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using Plugin.Connectivity.Abstractions;
-using Xamarin.Forms;
-using XLabs.Ioc;
-
-namespace Bit.App.Behaviors
-{
-    public class ConnectivityBehavior : Behavior<Element>
-    {
-        private readonly IConnectivity _connectivity;
-
-        public ConnectivityBehavior()
-        {
-            _connectivity = Resolver.Resolve<IConnectivity>();
-        }
-
-        private static readonly BindablePropertyKey IsValidPropertyKey = BindableProperty.CreateReadOnly("Connected", typeof(bool), typeof(ConnectivityBehavior), false);
-        public static readonly BindableProperty IsValidProperty = IsValidPropertyKey.BindableProperty;
-
-        public bool Connected
-        {
-            get { return (bool)GetValue(IsValidProperty); }
-            private set { SetValue(IsValidPropertyKey, value); }
-        }
-
-        protected override void OnAttachedTo(Element el)
-        {
-            _connectivity.ConnectivityChanged += ConnectivityChanged;
-            base.OnAttachedTo(el);
-        }
-
-        private void ConnectivityChanged(object sender, ConnectivityChangedEventArgs e)
-        {
-            Connected = e.IsConnected;
-        }
-
-        protected override void OnDetachingFrom(Element el)
-        {
-            _connectivity.ConnectivityChanged -= ConnectivityChanged;
-            base.OnDetachingFrom(el);
-        }
-    }
-}
diff --git a/src/App/Behaviors/EmailValidationBehavior.cs b/src/App/Behaviors/EmailValidationBehavior.cs
deleted file mode 100644
index 55cf64d79..000000000
--- a/src/App/Behaviors/EmailValidationBehavior.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Text.RegularExpressions;
-using Xamarin.Forms;
-
-namespace Bit.App.Behaviors
-{
-    public class EmailValidationBehavior : Behavior<Entry>
-    {
-        private const string EmailRegex = @"^(?("")("".+?(?<!\\)""@)|(([0-9a-z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-z])@))" +
-            @"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-z][-\w]*[0-9a-z]*\.)+[a-z0-9][\-a-z0-9]{0,22}[a-z0-9]))$";
-
-        private static readonly BindablePropertyKey IsValidPropertyKey = BindableProperty.CreateReadOnly("IsValid", typeof(bool), typeof(EmailValidationBehavior), false);
-        public static readonly BindableProperty IsValidProperty = IsValidPropertyKey.BindableProperty;
-
-        public bool IsValid
-        {
-            get { return (bool)GetValue(IsValidProperty); }
-            private set { SetValue(IsValidPropertyKey, value); }
-        }
-
-        protected override void OnAttachedTo(Entry entry)
-        {
-            entry.TextChanged += HandleTextChanged;
-            base.OnAttachedTo(entry);
-        }
-
-        void HandleTextChanged(object sender, TextChangedEventArgs e)
-        {
-            IsValid = Regex.IsMatch(e.NewTextValue, EmailRegex, RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(250));
-            ((Entry)sender).BackgroundColor = IsValid ? Color.Default : Color.Red;
-        }
-
-        protected override void OnDetachingFrom(Entry entry)
-        {
-            entry.TextChanged -= HandleTextChanged;
-            base.OnDetachingFrom(entry);
-        }
-    }
-}
diff --git a/src/App/Behaviors/RequiredValidationBehavior.cs b/src/App/Behaviors/RequiredValidationBehavior.cs
deleted file mode 100644
index b45b011ef..000000000
--- a/src/App/Behaviors/RequiredValidationBehavior.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using Xamarin.Forms;
-
-namespace Bit.App.Behaviors
-{
-    public class RequiredValidationBehavior : Behavior<Entry>
-    {
-        private static readonly BindablePropertyKey IsValidPropertyKey = BindableProperty.CreateReadOnly("IsValid", typeof(bool), typeof(RequiredValidationBehavior), false);
-        public static readonly BindableProperty IsValidProperty = IsValidPropertyKey.BindableProperty;
-
-        public bool IsValid
-        {
-            get { return (bool)GetValue(IsValidProperty); }
-            private set { SetValue(IsValidPropertyKey, value); }
-        }
-
-        protected override void OnAttachedTo(Entry entry)
-        {
-            entry.TextChanged += HandleTextChanged;
-            base.OnAttachedTo(entry);
-        }
-
-        void HandleTextChanged(object sender, TextChangedEventArgs e)
-        {
-            IsValid = !string.IsNullOrWhiteSpace(e.NewTextValue);
-            ((Entry)sender).BackgroundColor = IsValid ? Color.Default : Color.Red;
-        }
-
-        protected override void OnDetachingFrom(Entry entry)
-        {
-            entry.TextChanged -= HandleTextChanged;
-            base.OnDetachingFrom(entry);
-        }
-    }
-}
diff --git a/src/App/Repositories/CipherApiRepository.cs b/src/App/Repositories/CipherApiRepository.cs
index 25c85f3a5..66fa6f51d 100644
--- a/src/App/Repositories/CipherApiRepository.cs
+++ b/src/App/Repositories/CipherApiRepository.cs
@@ -79,7 +79,7 @@ namespace Bit.App.Repositories
                     var responseObj = JsonConvert.DeserializeObject<ListResponse<CipherResponse>>(responseContent);
                     return ApiResult<ListResponse<CipherResponse>>.Success(responseObj, response.StatusCode);
                 }
-                catch(WebException)
+                catch(WebException e)
                 {
                     return HandledWebException<ListResponse<CipherResponse>>();
                 }
diff --git a/src/App/Utilities/ApiHttpClient.cs b/src/App/Utilities/ApiHttpClient.cs
index 87d5cb84c..3a3706ebf 100644
--- a/src/App/Utilities/ApiHttpClient.cs
+++ b/src/App/Utilities/ApiHttpClient.cs
@@ -1,5 +1,4 @@
 using System.Net.Http;
-using ModernHttpClient;
 using System;
 using System.Net.Http.Headers;
 
@@ -8,7 +7,6 @@ namespace Bit.App
     public class ApiHttpClient : HttpClient
     {
         public ApiHttpClient()
-            : base(new NativeMessageHandler())
         {
             BaseAddress = new Uri("https://api.bitwarden.com");
             DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
diff --git a/src/App/packages.config b/src/App/packages.config
index dfbf8e369..9858794a4 100644
--- a/src/App/packages.config
+++ b/src/App/packages.config
@@ -3,7 +3,6 @@
   <package id="Acr.UserDialogs" version="6.0.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="portable45-net45+win8+wpa81" />
   <package id="HockeySDK.Xamarin" version="4.1.0" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="modernhttpclient" version="2.4.2" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="PCLCrypto" version="2.0.147" targetFramework="portable45-net45+win8+wpa81" />
   <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="portable45-net45+win8+wpa81" />
@@ -20,6 +19,6 @@
   <package id="Xam.Plugin.Connectivity" version="2.2.12" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xam.Plugin.PushNotification" version="1.2.4" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="Xam.Plugins.Settings" version="2.1.0" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms" version="2.3.3.168" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms" version="2.3.3.175" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.IoC" version="2.0.5782" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
\ No newline at end of file
diff --git a/src/iOS.Extension/iOS.Extension.csproj b/src/iOS.Extension/iOS.Extension.csproj
index a13415ce8..9dee90e0c 100644
--- a/src/iOS.Extension/iOS.Extension.csproj
+++ b/src/iOS.Extension/iOS.Extension.csproj
@@ -76,7 +76,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARM64</MtouchArch>
+    <MtouchArch>ARMv6</MtouchArch>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>True</MtouchDebug>
@@ -84,7 +84,6 @@
     </CodesignProvision>
     <CodesignExtraArgs>
     </CodesignExtraArgs>
-    <MtouchSdkVersion>9.3</MtouchSdkVersion>
     <MtouchLink>None</MtouchLink>
     <MtouchProfiling>False</MtouchProfiling>
     <MtouchFastDev>False</MtouchFastDev>
@@ -94,12 +93,9 @@
     <MtouchUseSGen>False</MtouchUseSGen>
     <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
-    <MtouchTlsProvider>Default</MtouchTlsProvider>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchFloat32>False</MtouchFloat32>
     <DeviceSpecificBuild>False</DeviceSpecificBuild>
-    <MtouchExtraArgs>
-    </MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -108,10 +104,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchArch>ARM64</MtouchArch>
+    <MtouchArch>ARMv6</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchSdkVersion>9.3</MtouchSdkVersion>
     <MtouchLink>Full</MtouchLink>
     <MtouchDebug>False</MtouchDebug>
     <MtouchProfiling>False</MtouchProfiling>
@@ -122,10 +117,8 @@
     <MtouchUseSGen>False</MtouchUseSGen>
     <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
-    <MtouchTlsProvider>Default</MtouchTlsProvider>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchFloat32>False</MtouchFloat32>
-    <MtouchExtraArgs>--linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
     <DebugType>none</DebugType>
@@ -134,12 +127,11 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <MtouchArch>ARM64</MtouchArch>
+    <MtouchArch>ARMv6</MtouchArch>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <BuildIpa>True</BuildIpa>
     <CodesignProvision>Automatic:AdHoc</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
-    <MtouchSdkVersion>9.3</MtouchSdkVersion>
     <MtouchLink>Full</MtouchLink>
     <MtouchDebug>False</MtouchDebug>
     <MtouchProfiling>False</MtouchProfiling>
@@ -150,10 +142,8 @@
     <MtouchUseSGen>False</MtouchUseSGen>
     <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
-    <MtouchTlsProvider>Default</MtouchTlsProvider>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchFloat32>False</MtouchFloat32>
-    <MtouchExtraArgs>--linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
     <DebugType>none</DebugType>
@@ -162,11 +152,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <MtouchArch>ARM64</MtouchArch>
+    <MtouchArch>ARMv6</MtouchArch>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <CodesignProvision>Automatic:AppStore</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
-    <MtouchSdkVersion>9.3</MtouchSdkVersion>
     <MtouchLink>Full</MtouchLink>
     <MtouchDebug>False</MtouchDebug>
     <MtouchProfiling>False</MtouchProfiling>
@@ -177,10 +166,8 @@
     <MtouchUseSGen>False</MtouchUseSGen>
     <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
-    <MtouchTlsProvider>Default</MtouchTlsProvider>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchFloat32>False</MtouchFloat32>
-    <MtouchExtraArgs>--linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhoneSimulator'">
     <MtouchSdkVersion>9.3</MtouchSdkVersion>
@@ -286,10 +273,6 @@
       <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.0\lib\Xamarin.iOS10\HockeySDK.iOSBindings.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
diff --git a/src/iOS.Extension/packages.config b/src/iOS.Extension/packages.config
index 306e833c7..33893be00 100644
--- a/src/iOS.Extension/packages.config
+++ b/src/iOS.Extension/packages.config
@@ -3,7 +3,6 @@
   <package id="Acr.Support" version="2.1.0" targetFramework="xamarinios10" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="xamarinios10" />
   <package id="HockeySDK.Xamarin" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="modernhttpclient" version="2.4.2" targetFramework="xamarinios10" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
   <package id="PCLCrypto" version="2.0.147" targetFramework="xamarinios10" />
   <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="xamarinios10" />
diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj
index 8950ee2ad..70f251e87 100644
--- a/src/iOS/iOS.csproj
+++ b/src/iOS/iOS.csproj
@@ -88,7 +88,6 @@
     </CodesignProvision>
     <CodesignExtraArgs>
     </CodesignExtraArgs>
-    <MtouchSdkVersion>9.3</MtouchSdkVersion>
     <MtouchLink>None</MtouchLink>
     <MtouchProfiling>False</MtouchProfiling>
     <MtouchFastDev>False</MtouchFastDev>
@@ -98,12 +97,9 @@
     <MtouchUseSGen>False</MtouchUseSGen>
     <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
-    <MtouchTlsProvider>Default</MtouchTlsProvider>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchFloat32>False</MtouchFloat32>
     <DeviceSpecificBuild>False</DeviceSpecificBuild>
-    <MtouchExtraArgs>
-    </MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -115,7 +111,6 @@
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchSdkVersion>9.3</MtouchSdkVersion>
     <MtouchLink>Full</MtouchLink>
     <MtouchDebug>False</MtouchDebug>
     <MtouchProfiling>False</MtouchProfiling>
@@ -126,10 +121,8 @@
     <MtouchUseSGen>False</MtouchUseSGen>
     <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
-    <MtouchTlsProvider>Default</MtouchTlsProvider>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchFloat32>False</MtouchFloat32>
-    <MtouchExtraArgs>--linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
     <DebugType>none</DebugType>
@@ -143,7 +136,6 @@
     <CodesignProvision>Automatic:AdHoc</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchSdkVersion>9.3</MtouchSdkVersion>
     <MtouchLink>Full</MtouchLink>
     <MtouchDebug>False</MtouchDebug>
     <MtouchProfiling>False</MtouchProfiling>
@@ -154,10 +146,8 @@
     <MtouchUseSGen>False</MtouchUseSGen>
     <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
-    <MtouchTlsProvider>Default</MtouchTlsProvider>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchFloat32>False</MtouchFloat32>
-    <MtouchExtraArgs>--linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
     <DebugType>none</DebugType>
@@ -170,7 +160,6 @@
     <CodesignProvision>Automatic:AppStore</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchSdkVersion>9.3</MtouchSdkVersion>
     <MtouchLink>Full</MtouchLink>
     <MtouchDebug>False</MtouchDebug>
     <MtouchProfiling>False</MtouchProfiling>
@@ -181,10 +170,8 @@
     <MtouchUseSGen>False</MtouchUseSGen>
     <MtouchUseRefCounting>False</MtouchUseRefCounting>
     <OptimizePNGs>True</OptimizePNGs>
-    <MtouchTlsProvider>Default</MtouchTlsProvider>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchFloat32>False</MtouchFloat32>
-    <MtouchExtraArgs>--linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
+    <MtouchExtraArgs>--http-message-handler=NSUrlSessionHandler --linkskip=Microsoft.Practices.Unity --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=SQLite-net</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhoneSimulator'">
     <MtouchSdkVersion>9.3</MtouchSdkVersion>
@@ -368,19 +355,19 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.168\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.iOS" />
@@ -390,9 +377,6 @@
     <Reference Include="Microsoft.Practices.Unity, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath>
     </Reference>
-    <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll</HintPath>
-    </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\..\packages\Splat.1.6.2\lib\Xamarin.iOS10\Splat.dll</HintPath>
     </Reference>
@@ -696,9 +680,9 @@
     <Error Condition="!Exists('..\..\packages\Xamarin.Google.iOS.Analytics.3.14.0.7\build\Xamarin.Google.iOS.Analytics.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Google.iOS.Analytics.3.14.0.7\build\Xamarin.Google.iOS.Analytics.targets'))" />
     <Error Condition="!Exists('..\..\packages\Xamarin.Build.Download.0.2.2-beta2\build\Xamarin.Build.Download.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Build.Download.0.2.2-beta2\build\Xamarin.Build.Download.props'))" />
     <Error Condition="!Exists('..\..\packages\Xamarin.Build.Download.0.2.2-beta2\build\Xamarin.Build.Download.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Build.Download.0.2.2-beta2\build\Xamarin.Build.Download.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
   </Target>
   <Import Project="..\..\packages\Xamarin.Google.iOS.Analytics.3.14.0.7\build\Xamarin.Google.iOS.Analytics.targets" Condition="Exists('..\..\packages\Xamarin.Google.iOS.Analytics.3.14.0.7\build\Xamarin.Google.iOS.Analytics.targets')" />
   <Import Project="..\..\packages\Xamarin.Build.Download.0.2.2-beta2\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.2.2-beta2\build\Xamarin.Build.Download.targets')" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/iOS/packages.config b/src/iOS/packages.config
index fd28bb612..dafbb9b38 100644
--- a/src/iOS/packages.config
+++ b/src/iOS/packages.config
@@ -5,7 +5,6 @@
   <package id="BTProgressHUD" version="1.2.0.3" targetFramework="xamarinios10" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="xamarinios10" />
   <package id="HockeySDK.Xamarin" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="modernhttpclient" version="2.4.2" targetFramework="xamarinios10" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
   <package id="PCLCrypto" version="2.0.147" targetFramework="xamarinios10" />
   <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="xamarinios10" />
@@ -23,7 +22,7 @@
   <package id="Xam.Plugin.PushNotification" version="1.2.4" targetFramework="xamarinios10" developmentDependency="true" />
   <package id="Xam.Plugins.Settings" version="2.1.0" targetFramework="xamarinios10" />
   <package id="Xamarin.Build.Download" version="0.2.2-beta2" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms" version="2.3.3.168" targetFramework="xamarinios10" />
+  <package id="Xamarin.Forms" version="2.3.3.175" targetFramework="xamarinios10" />
   <package id="Xamarin.Google.iOS.Analytics" version="3.14.0.7" targetFramework="xamarinios10" />
   <package id="XLabs.IoC" version="2.0.5782" targetFramework="xamarinios10" />
   <package id="XLabs.IoC.Unity" version="2.0.5782" targetFramework="xamarinios10" />
diff --git a/test/Android.Test/Resources/Resource.Designer.cs b/test/Android.Test/Resources/Resource.Designer.cs
index 7fcc8520b..20840f007 100644
--- a/test/Android.Test/Resources/Resource.Designer.cs
+++ b/test/Android.Test/Resources/Resource.Designer.cs
@@ -26,6 +26,8 @@ namespace Bit.Android.Test
 		
 		public static void UpdateIdValues()
 		{
+			global::PCLCrypto.Resource.String.ApplicationName = global::Bit.Android.Test.Resource.String.ApplicationName;
+			global::PCLCrypto.Resource.String.Hello = global::Bit.Android.Test.Resource.String.Hello;
 			global::Xamarin.Android.NUnitLite.Resource.Id.OptionHostName = global::Bit.Android.Test.Resource.Id.OptionHostName;
 			global::Xamarin.Android.NUnitLite.Resource.Id.OptionPort = global::Bit.Android.Test.Resource.Id.OptionPort;
 			global::Xamarin.Android.NUnitLite.Resource.Id.OptionRemoteServer = global::Bit.Android.Test.Resource.Id.OptionRemoteServer;
@@ -2805,11 +2807,11 @@ namespace Bit.Android.Test
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7f09001c
-			public const int ApplicationName = 2131296284;
+			// aapt resource value: 0x7f090063
+			public const int ApplicationName = 2131296355;
 			
-			// aapt resource value: 0x7f09001b
-			public const int Hello = 2131296283;
+			// aapt resource value: 0x7f090062
+			public const int Hello = 2131296354;
 			
 			// aapt resource value: 0x7f090006
 			public const int abc_action_bar_home_description = 2131296262;
@@ -2886,218 +2888,218 @@ namespace Bit.Android.Test
 			// aapt resource value: 0x7f090002
 			public const int common_google_play_services_unknown_issue = 2131296258;
 			
+			// aapt resource value: 0x7f09001b
+			public const int hockeyapp_crash_dialog_app_name_fallback = 2131296283;
+			
+			// aapt resource value: 0x7f09001c
+			public const int hockeyapp_crash_dialog_message = 2131296284;
+			
 			// aapt resource value: 0x7f09001d
-			public const int hockeyapp_crash_dialog_app_name_fallback = 2131296285;
+			public const int hockeyapp_crash_dialog_negative_button = 2131296285;
 			
 			// aapt resource value: 0x7f09001e
-			public const int hockeyapp_crash_dialog_message = 2131296286;
+			public const int hockeyapp_crash_dialog_neutral_button = 2131296286;
 			
 			// aapt resource value: 0x7f09001f
-			public const int hockeyapp_crash_dialog_negative_button = 2131296287;
+			public const int hockeyapp_crash_dialog_positive_button = 2131296287;
 			
 			// aapt resource value: 0x7f090020
-			public const int hockeyapp_crash_dialog_neutral_button = 2131296288;
+			public const int hockeyapp_crash_dialog_title = 2131296288;
 			
 			// aapt resource value: 0x7f090021
-			public const int hockeyapp_crash_dialog_positive_button = 2131296289;
+			public const int hockeyapp_dialog_error_message = 2131296289;
 			
 			// aapt resource value: 0x7f090022
-			public const int hockeyapp_crash_dialog_title = 2131296290;
+			public const int hockeyapp_dialog_error_title = 2131296290;
 			
 			// aapt resource value: 0x7f090023
-			public const int hockeyapp_dialog_error_message = 2131296291;
+			public const int hockeyapp_dialog_negative_button = 2131296291;
 			
 			// aapt resource value: 0x7f090024
-			public const int hockeyapp_dialog_error_title = 2131296292;
+			public const int hockeyapp_dialog_positive_button = 2131296292;
 			
 			// aapt resource value: 0x7f090025
-			public const int hockeyapp_dialog_negative_button = 2131296293;
+			public const int hockeyapp_download_failed_dialog_message = 2131296293;
 			
 			// aapt resource value: 0x7f090026
-			public const int hockeyapp_dialog_positive_button = 2131296294;
+			public const int hockeyapp_download_failed_dialog_negative_button = 2131296294;
 			
 			// aapt resource value: 0x7f090027
-			public const int hockeyapp_download_failed_dialog_message = 2131296295;
+			public const int hockeyapp_download_failed_dialog_positive_button = 2131296295;
 			
 			// aapt resource value: 0x7f090028
-			public const int hockeyapp_download_failed_dialog_negative_button = 2131296296;
+			public const int hockeyapp_download_failed_dialog_title = 2131296296;
 			
 			// aapt resource value: 0x7f090029
-			public const int hockeyapp_download_failed_dialog_positive_button = 2131296297;
+			public const int hockeyapp_error_no_network_message = 2131296297;
 			
 			// aapt resource value: 0x7f09002a
-			public const int hockeyapp_download_failed_dialog_title = 2131296298;
+			public const int hockeyapp_expiry_info_text = 2131296298;
 			
 			// aapt resource value: 0x7f09002b
-			public const int hockeyapp_error_no_network_message = 2131296299;
+			public const int hockeyapp_expiry_info_title = 2131296299;
 			
 			// aapt resource value: 0x7f09002c
-			public const int hockeyapp_expiry_info_text = 2131296300;
+			public const int hockeyapp_feedback_attach_file = 2131296300;
 			
 			// aapt resource value: 0x7f09002d
-			public const int hockeyapp_expiry_info_title = 2131296301;
+			public const int hockeyapp_feedback_attach_picture = 2131296301;
 			
 			// aapt resource value: 0x7f09002e
-			public const int hockeyapp_feedback_attach_file = 2131296302;
+			public const int hockeyapp_feedback_attachment_button_text = 2131296302;
 			
 			// aapt resource value: 0x7f09002f
-			public const int hockeyapp_feedback_attach_picture = 2131296303;
+			public const int hockeyapp_feedback_attachment_error = 2131296303;
 			
 			// aapt resource value: 0x7f090030
-			public const int hockeyapp_feedback_attachment_button_text = 2131296304;
+			public const int hockeyapp_feedback_attachment_loading = 2131296304;
 			
 			// aapt resource value: 0x7f090031
-			public const int hockeyapp_feedback_attachment_error = 2131296305;
+			public const int hockeyapp_feedback_email_hint = 2131296305;
 			
 			// aapt resource value: 0x7f090032
-			public const int hockeyapp_feedback_attachment_loading = 2131296306;
+			public const int hockeyapp_feedback_failed_text = 2131296306;
 			
 			// aapt resource value: 0x7f090033
-			public const int hockeyapp_feedback_email_hint = 2131296307;
+			public const int hockeyapp_feedback_failed_title = 2131296307;
 			
 			// aapt resource value: 0x7f090034
-			public const int hockeyapp_feedback_failed_text = 2131296308;
+			public const int hockeyapp_feedback_fetching_feedback_text = 2131296308;
 			
 			// aapt resource value: 0x7f090035
-			public const int hockeyapp_feedback_failed_title = 2131296309;
+			public const int hockeyapp_feedback_generic_error = 2131296309;
 			
 			// aapt resource value: 0x7f090036
-			public const int hockeyapp_feedback_fetching_feedback_text = 2131296310;
+			public const int hockeyapp_feedback_last_updated_text = 2131296310;
 			
 			// aapt resource value: 0x7f090037
-			public const int hockeyapp_feedback_generic_error = 2131296311;
+			public const int hockeyapp_feedback_max_attachments_allowed = 2131296311;
 			
 			// aapt resource value: 0x7f090038
-			public const int hockeyapp_feedback_last_updated_text = 2131296312;
+			public const int hockeyapp_feedback_message_hint = 2131296312;
 			
 			// aapt resource value: 0x7f090039
-			public const int hockeyapp_feedback_max_attachments_allowed = 2131296313;
+			public const int hockeyapp_feedback_name_hint = 2131296313;
 			
 			// aapt resource value: 0x7f09003a
-			public const int hockeyapp_feedback_message_hint = 2131296314;
+			public const int hockeyapp_feedback_refresh_button_text = 2131296314;
 			
 			// aapt resource value: 0x7f09003b
-			public const int hockeyapp_feedback_name_hint = 2131296315;
+			public const int hockeyapp_feedback_response_button_text = 2131296315;
 			
 			// aapt resource value: 0x7f09003c
-			public const int hockeyapp_feedback_refresh_button_text = 2131296316;
+			public const int hockeyapp_feedback_select_file = 2131296316;
 			
 			// aapt resource value: 0x7f09003d
-			public const int hockeyapp_feedback_response_button_text = 2131296317;
+			public const int hockeyapp_feedback_select_picture = 2131296317;
 			
 			// aapt resource value: 0x7f09003e
-			public const int hockeyapp_feedback_select_file = 2131296318;
+			public const int hockeyapp_feedback_send_button_text = 2131296318;
 			
 			// aapt resource value: 0x7f09003f
-			public const int hockeyapp_feedback_select_picture = 2131296319;
+			public const int hockeyapp_feedback_send_generic_error = 2131296319;
 			
 			// aapt resource value: 0x7f090040
-			public const int hockeyapp_feedback_send_button_text = 2131296320;
+			public const int hockeyapp_feedback_send_network_error = 2131296320;
 			
 			// aapt resource value: 0x7f090041
-			public const int hockeyapp_feedback_send_generic_error = 2131296321;
+			public const int hockeyapp_feedback_sending_feedback_text = 2131296321;
 			
 			// aapt resource value: 0x7f090042
-			public const int hockeyapp_feedback_send_network_error = 2131296322;
+			public const int hockeyapp_feedback_subject_hint = 2131296322;
 			
 			// aapt resource value: 0x7f090043
-			public const int hockeyapp_feedback_sending_feedback_text = 2131296323;
+			public const int hockeyapp_feedback_title = 2131296323;
 			
 			// aapt resource value: 0x7f090044
-			public const int hockeyapp_feedback_subject_hint = 2131296324;
+			public const int hockeyapp_feedback_validate_email_empty = 2131296324;
 			
 			// aapt resource value: 0x7f090045
-			public const int hockeyapp_feedback_title = 2131296325;
+			public const int hockeyapp_feedback_validate_email_error = 2131296325;
 			
 			// aapt resource value: 0x7f090046
-			public const int hockeyapp_feedback_validate_email_empty = 2131296326;
+			public const int hockeyapp_feedback_validate_name_error = 2131296326;
 			
 			// aapt resource value: 0x7f090047
-			public const int hockeyapp_feedback_validate_email_error = 2131296327;
+			public const int hockeyapp_feedback_validate_subject_error = 2131296327;
 			
 			// aapt resource value: 0x7f090048
-			public const int hockeyapp_feedback_validate_name_error = 2131296328;
+			public const int hockeyapp_feedback_validate_text_error = 2131296328;
 			
 			// aapt resource value: 0x7f090049
-			public const int hockeyapp_feedback_validate_subject_error = 2131296329;
+			public const int hockeyapp_login_email_hint = 2131296329;
 			
 			// aapt resource value: 0x7f09004a
-			public const int hockeyapp_feedback_validate_text_error = 2131296330;
+			public const int hockeyapp_login_headline_text = 2131296330;
 			
 			// aapt resource value: 0x7f09004b
-			public const int hockeyapp_login_email_hint = 2131296331;
+			public const int hockeyapp_login_headline_text_email_only = 2131296331;
 			
 			// aapt resource value: 0x7f09004c
-			public const int hockeyapp_login_headline_text = 2131296332;
+			public const int hockeyapp_login_login_button_text = 2131296332;
 			
 			// aapt resource value: 0x7f09004d
-			public const int hockeyapp_login_headline_text_email_only = 2131296333;
+			public const int hockeyapp_login_missing_credentials_toast = 2131296333;
 			
 			// aapt resource value: 0x7f09004e
-			public const int hockeyapp_login_login_button_text = 2131296334;
+			public const int hockeyapp_login_password_hint = 2131296334;
 			
 			// aapt resource value: 0x7f09004f
-			public const int hockeyapp_login_missing_credentials_toast = 2131296335;
+			public const int hockeyapp_paint_dialog_message = 2131296335;
 			
 			// aapt resource value: 0x7f090050
-			public const int hockeyapp_login_password_hint = 2131296336;
+			public const int hockeyapp_paint_dialog_negative_button = 2131296336;
 			
 			// aapt resource value: 0x7f090051
-			public const int hockeyapp_paint_dialog_message = 2131296337;
+			public const int hockeyapp_paint_dialog_neutral_button = 2131296337;
 			
 			// aapt resource value: 0x7f090052
-			public const int hockeyapp_paint_dialog_negative_button = 2131296338;
+			public const int hockeyapp_paint_dialog_positive_button = 2131296338;
 			
 			// aapt resource value: 0x7f090053
-			public const int hockeyapp_paint_dialog_neutral_button = 2131296339;
+			public const int hockeyapp_paint_indicator_toast = 2131296339;
 			
 			// aapt resource value: 0x7f090054
-			public const int hockeyapp_paint_dialog_positive_button = 2131296340;
+			public const int hockeyapp_paint_menu_clear = 2131296340;
 			
 			// aapt resource value: 0x7f090055
-			public const int hockeyapp_paint_indicator_toast = 2131296341;
+			public const int hockeyapp_paint_menu_save = 2131296341;
 			
 			// aapt resource value: 0x7f090056
-			public const int hockeyapp_paint_menu_clear = 2131296342;
+			public const int hockeyapp_paint_menu_undo = 2131296342;
 			
 			// aapt resource value: 0x7f090057
-			public const int hockeyapp_paint_menu_save = 2131296343;
+			public const int hockeyapp_permission_dialog_negative_button = 2131296343;
 			
 			// aapt resource value: 0x7f090058
-			public const int hockeyapp_paint_menu_undo = 2131296344;
+			public const int hockeyapp_permission_dialog_positive_button = 2131296344;
 			
 			// aapt resource value: 0x7f090059
-			public const int hockeyapp_permission_dialog_negative_button = 2131296345;
+			public const int hockeyapp_permission_update_message = 2131296345;
 			
 			// aapt resource value: 0x7f09005a
-			public const int hockeyapp_permission_dialog_positive_button = 2131296346;
+			public const int hockeyapp_permission_update_title = 2131296346;
 			
 			// aapt resource value: 0x7f09005b
-			public const int hockeyapp_permission_update_message = 2131296347;
+			public const int hockeyapp_update_button = 2131296347;
 			
 			// aapt resource value: 0x7f09005c
-			public const int hockeyapp_permission_update_title = 2131296348;
+			public const int hockeyapp_update_dialog_message = 2131296348;
 			
 			// aapt resource value: 0x7f09005d
-			public const int hockeyapp_update_button = 2131296349;
+			public const int hockeyapp_update_dialog_negative_button = 2131296349;
 			
 			// aapt resource value: 0x7f09005e
-			public const int hockeyapp_update_dialog_message = 2131296350;
+			public const int hockeyapp_update_dialog_positive_button = 2131296350;
 			
 			// aapt resource value: 0x7f09005f
-			public const int hockeyapp_update_dialog_negative_button = 2131296351;
+			public const int hockeyapp_update_dialog_title = 2131296351;
 			
 			// aapt resource value: 0x7f090060
-			public const int hockeyapp_update_dialog_positive_button = 2131296352;
+			public const int hockeyapp_update_mandatory_toast = 2131296352;
 			
 			// aapt resource value: 0x7f090061
-			public const int hockeyapp_update_dialog_title = 2131296353;
-			
-			// aapt resource value: 0x7f090062
-			public const int hockeyapp_update_mandatory_toast = 2131296354;
-			
-			// aapt resource value: 0x7f090063
-			public const int hockeyapp_update_version_details_label = 2131296355;
+			public const int hockeyapp_update_version_details_label = 2131296353;
 			
 			// aapt resource value: 0x7f09001a
 			public const int library_name = 2131296282;