diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
index 0fa36ca46e..94ad0e360d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
@@ -46,8 +46,9 @@
         vm.allowPasswordReset = Umbraco.Sys.ServerVariables.umbracoSettings.canSendRequiredEmail && Umbraco.Sys.ServerVariables.umbracoSettings.allowPasswordReset;
         vm.errorMsg = "";
         vm.externalLoginFormAction = Umbraco.Sys.ServerVariables.umbracoUrls.externalLoginsUrl;
-        vm.externalLoginProviders = externalLoginInfo.providers;
+        vm.externalLoginProviders = externalLoginInfoService.getLoginProviders();
         vm.denyLocalLogin = externalLoginInfoService.hasDenyLocalLogin();
+        vm.externalLoginProviderView = externalLoginInfo.errorProvider ? externalLoginInfoService.getExternalLoginProviderViewForErrors(externalLoginInfo.errorProvider) : null;
         vm.externalLoginInfo = externalLoginInfo;
         vm.resetPasswordCodeInfo = resetPasswordCodeInfo;
         vm.backgroundImage = Umbraco.Sys.ServerVariables.umbracoSettings.loginBackgroundImage;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js b/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js
index 5baa54506d..fe9d1f1f8a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js
@@ -3,7 +3,31 @@
  * @name umbraco.services.externalLoginInfoService
  * @description A service for working with external login providers
  **/
-function externalLoginInfoService(externalLoginInfo) {
+function externalLoginInfoService(externalLoginInfo, umbRequestHelper) {
+
+    function getExternalLoginProvider(provider) {
+        if (provider) {
+            var found = _.filter(externalLoginInfo.providers, x => x.authType == provider);
+            return found;
+        }
+        return null;
+    }
+
+    function getExternalLoginProviderView(provider) {
+        var found = getExternalLoginProvider(provider);
+        if (found) {
+            return umbRequestHelper.convertVirtualToAbsolutePath(found.properties.UmbracoBackOfficeExternalLoginOptions.BackOfficeCustomLoginView);
+        }
+        return null;
+    }
+
+    function getExternalLoginProviderViewForErrors(provider) {
+        var found = getExternalLoginProvider(provider);
+        if (found && found.properties.UmbracoBackOfficeExternalLoginOptions.BackOfficeCustomLoginViewHandlesErrors) {
+            return umbRequestHelper.convertVirtualToAbsolutePath(found.properties.UmbracoBackOfficeExternalLoginOptions.BackOfficeCustomLoginView);
+        }
+        return null;
+    }
 
     /**
      * Returns true if any provider denies local login if `provider` is null, else whether the passed 
@@ -49,7 +73,9 @@ function externalLoginInfoService(externalLoginInfo) {
     return {
         hasDenyLocalLogin: hasDenyLocalLogin,
         getLoginProviders: getLoginProviders,
-        getUserInviteLink: getUserInviteLink
+        getUserInviteLink: getUserInviteLink,
+        getExternalLoginProviderView: getExternalLoginProviderView,
+        getExternalLoginProviderViewForErrors: getExternalLoginProviderViewForErrors
     };
 }
 angular.module('umbraco.services').factory('externalLoginInfoService', externalLoginInfoService);
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index b77236d84f..385977fdc5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -125,8 +125,13 @@
 
                     <div class="external-logins" ng-if="vm.externalLoginProviders.length > 0">
 
-                        <div class="text-error" ng-repeat="error in vm.externalLoginInfo.errors">
-                            <span>{{error}}</span>
+                        <div ng-if="!vm.externalLoginProviderView">
+                            <div class="text-error" ng-repeat="error in vm.externalLoginInfo.errors">
+                                <span>{{error}}</span>
+                            </div>
+                        </div>
+                        <div ng-if="vm.externalLoginProviderView">
+                            <div ng-include="vm.externalLoginProviderView"></div>
                         </div>
 
                         <form method="POST" name="vm.externalLoginForm" action="{{vm.externalLoginFormAction}}">
@@ -146,41 +151,41 @@
 
                     </div>
 
-                    <form ng-if="!vm.denyLocalLogin" method="POST" name="vm.loginForm" ng-submit="vm.loginSubmit()">
+                        <form ng-if="!vm.denyLocalLogin" method="POST" name="vm.loginForm" ng-submit="vm.loginSubmit()">
 
-                        <div ng-messages="vm.loginForm.$error" class="control-group" aria-live="assertive">
-                            <p ng-message="auth" class="text-error" role="alert">{{vm.errorMsg}}</p>
-                        </div>
-                        <div class="control-group" ng-class="{error: vm.loginForm.username.$invalid}">
-                            <label for="umb-username">{{vm.labels.usernameLabel}}</label>
-                            <input type="text" ng-model="vm.login" name="username" id="umb-username" class="-full-width-input" placeholder="{{vm.labels.usernamePlaceholder}}" focus-when="{{vm.view === 'login'}}" />
-                        </div>
-
-                        <div class="control-group" ng-class="{error: vm.loginForm.password.$invalid}">
-                            <label for="umb-passwordTwo"><localize key="general_password">Password</localize></label>
-                            <input type="password" ng-model="vm.password" name="password" id="umb-passwordTwo" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" />
-                            <div class="password-toggle">
-                                <a href="#" prevent-default ng-click="vm.togglePassword()">
-                                    <span class="password-text show"><localize key="login_showPassword">Show password</localize></span>
-                                    <span class="password-text hide"><localize key="login_hidePassword">Hide password</localize></span>
-                                </a>
+                            <div ng-messages="vm.loginForm.$error" class="control-group" aria-live="assertive">
+                                <p ng-message="auth" class="text-error" role="alert">{{vm.errorMsg}}</p>
                             </div>
-                        </div>
-
-                        <div class="flex justify-between items-center">
-                            <umb-button button-style="success"
-                                        size="m"
-                                        label-key="general_login"
-                                        state="vm.loginStates.submitButton"
-                                        type="submit">
-                            </umb-button>
-                            <div ng-show="vm.allowPasswordReset">
-                                <a class="muted" style="text-decoration: underline;" href="#" prevent-default ng-click="vm.showRequestPasswordReset()"><localize key="login_forgottenPassword">Forgotten password?</localize></a>
+                            <div class="control-group" ng-class="{error: vm.loginForm.username.$invalid}">
+                                <label for="umb-username">{{vm.labels.usernameLabel}}</label>
+                                <input type="text" ng-model="vm.login" name="username" id="umb-username" class="-full-width-input" placeholder="{{vm.labels.usernamePlaceholder}}" focus-when="{{vm.view === 'login'}}" />
                             </div>
-                        </div>
 
-                    </form>
-                </div>
+                            <div class="control-group" ng-class="{error: vm.loginForm.password.$invalid}">
+                                <label for="umb-passwordTwo"><localize key="general_password">Password</localize></label>
+                                <input type="password" ng-model="vm.password" name="password" id="umb-passwordTwo" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" />
+                                <div class="password-toggle">
+                                    <a href="#" prevent-default ng-click="vm.togglePassword()">
+                                        <span class="password-text show"><localize key="login_showPassword">Show password</localize></span>
+                                        <span class="password-text hide"><localize key="login_hidePassword">Hide password</localize></span>
+                                    </a>
+                                </div>
+                            </div>
+
+                            <div class="flex justify-between items-center">
+                                <umb-button button-style="success"
+                                            size="m"
+                                            label-key="general_login"
+                                            state="vm.loginStates.submitButton"
+                                            type="submit">
+                                </umb-button>
+                                <div ng-show="vm.allowPasswordReset">
+                                    <a class="muted" style="text-decoration: underline;" href="#" prevent-default ng-click="vm.showRequestPasswordReset()"><localize key="login_forgottenPassword">Forgotten password?</localize></a>
+                                </div>
+                            </div>
+
+                        </form>
+                    </div>
 
                 <div ng-if="!vm.denyLocalLogin" ng-show="vm.view == 'request-password-reset'">
                     <p tabindex="0">
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index b7c1e6540c..f6f9b4b656 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -61,7 +61,7 @@
     <script type="text/javascript">
     document.angularReady = function (app) {
 
-        @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInError())
+        @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInProviderErrors())
         @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
 
     }
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index 265d9436c4..7564b670cb 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -82,10 +82,9 @@ namespace Umbraco.Web
                 }
             }
 
-            // TODO: Here we can check if there are 
-
             sb.AppendLine(@"app.value(""externalLoginInfo"", {");
-            sb.AppendLine($@"errorProvider: '{externalLoginErrors.AuthenticationType}',");
+            if (externalLoginErrors?.AuthenticationType != null)
+                sb.AppendLine($@"errorProvider: '{externalLoginErrors.AuthenticationType}',");
             sb.AppendLine(@"errors: errors,");
             sb.Append(@"providers: ");
             sb.AppendLine(JsonConvert.SerializeObject(loginProviders));
diff --git a/src/Umbraco.Web/ViewDataExtensions.cs b/src/Umbraco.Web/ViewDataExtensions.cs
index d8dfe98da8..7a881bd8f9 100644
--- a/src/Umbraco.Web/ViewDataExtensions.cs
+++ b/src/Umbraco.Web/ViewDataExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Web.Mvc;
 using Umbraco.Web.Security;
 
@@ -64,7 +65,7 @@ namespace Umbraco.Web
         public static IEnumerable<string> GetExternalSignInError(this ViewDataDictionary viewData)
         {
             var errs = viewData.GetExternalSignInProviderErrors();
-            return errs.Errors;
+            return errs?.Errors ?? Enumerable.Empty<string>();
         }
 
         /// <summary>