diff --git a/src/Umbraco.Core/Services/Implement/UserService.cs b/src/Umbraco.Core/Services/Implement/UserService.cs
index bf732263a9..ca42d5878a 100644
--- a/src/Umbraco.Core/Services/Implement/UserService.cs
+++ b/src/Umbraco.Core/Services/Implement/UserService.cs
@@ -205,7 +205,7 @@ namespace Umbraco.Core.Services.Implement
                         //NOTE: this will not be cached
                         return _userRepository.GetByUsername(username, includeSecurityData: false);
                     }
-                    
+
                     throw;
                 }
             }
@@ -258,7 +258,7 @@ namespace Umbraco.Core.Services.Implement
         // this method must exist in this service as an implementation (legacy)
         void IMembershipMemberService<IUser>.SetLastLogin(string username, DateTime date)
         {
-            throw new NotSupportedException("This method is not implemented or supported for users");
+            Logger.Warn<UserService>("This method is not implemented. Using membership providers users is not advised, use ASP.NET Identity instead. See issue #9224 for more information.");
         }
 
         /// <summary>
@@ -717,7 +717,7 @@ namespace Umbraco.Core.Services.Implement
                         //NOTE: this will not be cached
                         return _userRepository.Get(id, includeSecurityData: false);
                     }
-                    
+
                     throw;
                 }
             }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautofocus.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautofocus.directive.js
index 47ef460c53..98c4ef691e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautofocus.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautofocus.directive.js
@@ -10,18 +10,14 @@ angular.module("umbraco.directives")
                 }
             };
 
-            //check if there's a value for the attribute, if there is and it's false then we conditionally don't
-            //use auto focus.
-            if (attrs.umbAutoFocus) {
-                attrs.$observe("umbAutoFocus", function (newVal) {
-                    var enabled = (newVal === "false" || newVal === 0 || newVal === false) ? false : true;
-                    if (enabled) {
-                        $timeout(function() {
-                            update();
-                        });
-                    }
-                });
-            }
+            attrs.$observe("umbAutoFocus", function (newVal) {
+                var enabled = (newVal === "false" || newVal === 0 || newVal === false) ? false : true;
+                if (enabled) {
+                    $timeout(function() {
+                        update();
+                    });
+                }
+            });
 
         };
 });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 3232ed7f34..8c7157c414 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -40,7 +40,7 @@
 (function () {
     'use strict';
 
-    function UmbRadiobuttonController($timeout) {
+    function UmbRadiobuttonController($timeout, localizationService) {
 
         var vm = this;
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
index 7e7f804656..36ce4541f1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
@@ -11,6 +11,11 @@ function angularHelper($q) {
     var requiredFormProps = ["$error", "$name", "$dirty", "$pristine", "$valid", "$submitted", "$pending"];
 
     function collectAllFormErrorsRecursively(formCtrl, allErrors) {
+        // skip if the control is already added to the array
+        if (allErrors.indexOf(formCtrl) !== -1) {
+            return;
+        }
+
         // loop over the error dictionary (see https://docs.angularjs.org/api/ng/type/form.FormController#$error)
         var keys = Object.keys(formCtrl.$error);
         if (keys.length === 0) {
@@ -31,6 +36,7 @@ function angularHelper($q) {
                         allErrors.push(ctrl); // add the error
                         return;
                     }
+
                     // recurse with the sub form
                     collectAllFormErrorsRecursively(ctrl, allErrors);
                 }
@@ -43,6 +49,7 @@ function angularHelper($q) {
     }
 
     function isForm(obj) {
+
         // a method to check that the collection of object prop names contains the property name expected
         function allPropertiesExist(objectPropNames) {
             //ensure that every required property name exists on the current object
@@ -89,9 +96,9 @@ function angularHelper($q) {
 
         /**
          * Method used to re-run the $parsers for a given ngModel
-         * @param {} scope 
-         * @param {} ngModel 
-         * @returns {} 
+         * @param {} scope
+         * @param {} ngModel
+         * @returns {}
          */
         revalidateNgModel: function (scope, ngModel) {
             this.safeApply(scope, function() {
@@ -103,8 +110,8 @@ function angularHelper($q) {
 
         /**
          * Execute a list of promises sequentially. Unlike $q.all which executes all promises at once, this will execute them in sequence.
-         * @param {} promises 
-         * @returns {} 
+         * @param {} promises
+         * @returns {}
          */
         executeSequentialPromises: function (promises) {
 
@@ -178,7 +185,7 @@ function angularHelper($q) {
             //NOTE: There isn't a way in angular to get a reference to the current form object since the form object
             // is just defined as a property of the scope when it is named but you'll always need to know the name which
             // isn't very convenient. If we want to watch for validation changes we need to get a form reference.
-            // The way that we detect the form object is a bit hackerific in that we detect all of the required properties 
+            // The way that we detect the form object is a bit hackerific in that we detect all of the required properties
             // that exist on a form object.
             //
             //The other way to do it in a directive is to require "^form", but in a controller the only other way to do it
@@ -239,7 +246,7 @@ function angularHelper($q) {
                 $submitted: false,
                 $pending: undefined,
                 $addControl: Utilities.noop,
-                $removeControl: Utilities.noop, 
+                $removeControl: Utilities.noop,
                 $setValidity: Utilities.noop,
                 $setDirty: Utilities.noop,
                 $setPristine: Utilities.noop,