diff --git a/src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs
index 8e3c6d97ca..c4290396b6 100644
--- a/src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs
+++ b/src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs
@@ -50,6 +50,7 @@ namespace Umbraco.Cms.Web.BackOffice.Filters
                     if (userIdentity.HasClaim(x => x.Type == ClaimTypes.CookiePath) == false)
                     {
                         await next();
+                        return;
                     }
                 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.controller.js
index 0d9341243b..5d3869283e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.controller.js
@@ -146,13 +146,14 @@
 
                     //check if the app domain is restarted ever 2 seconds
                     var count = 0;
+                    var maxCount = 5;
 
                     function checkRestart() {
                         $timeout(function () {
                             packageResource.checkRestart(pack).then(function (d) {
                                 count++;
                                 //if there is an id it means it's not restarted yet but we'll limit it to only check 10 times
-                                if (d.isRestarting && count < 10) {
+                                if (d.isRestarting && count < maxCount) {
                                     checkRestart();
                                 }
                                 else {
@@ -160,9 +161,16 @@
                                     deferred.resolve(d);
                                 }
                             },
-                                installError);
+                                function(){
+                                  if(count >= maxCount){
+                                    installError();
+                                  }
+                                  else {
+                                    checkRestart();
+                                  }
+                                });
                         },
-                            2000);
+                            2000*(count+1));
                     }
 
                     checkRestart();