diff --git a/.gitignore b/.gitignore
index 027bb5d1fe..8e77a3ce1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,4 @@ src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
 src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
 src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
 src/Umbraco.Web.UI/umbraco/plugins/*
+src/Umbraco.Web.UI/umbraco/js/init.js
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
index 78a19e979c..9348541826 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
@@ -218,7 +218,7 @@ angular.module('umbraco.services')
 
                         var result = { user: data, authenticated: true, lastUserId: lastUserId };
 
-                        if (args.broadcastEvent) {
+                        if (args && args.broadcastEvent) {
                             //broadcast a global event, will inform listening controllers to load in the user specific data
                             $rootScope.$broadcast("authenticated", result);
                         }