diff --git a/lib/javax.annotation.jar b/lib/javax.annotation.jar
new file mode 100644
index 0000000000000000000000000000000000000000..52dca7f561c5d579ca764cb25b96d3f539cf242a
Binary files /dev/null and b/lib/javax.annotation.jar differ
diff --git a/lib/javax.ejb.jar b/lib/javax.ejb.jar
new file mode 100644
index 0000000000000000000000000000000000000000..4ebf5ecd4c9ab83540ef206f6c5a1906db008098
Binary files /dev/null and b/lib/javax.ejb.jar differ
diff --git a/lib/javax.jms.jar b/lib/javax.jms.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d31451ada1ad9a4471d9bae383df647c9b4b5235
Binary files /dev/null and b/lib/javax.jms.jar differ
diff --git a/lib/javax.persistence.jar b/lib/javax.persistence.jar
new file mode 100644
index 0000000000000000000000000000000000000000..21d80e0ed3b5e20aa787087247a006398cda7679
Binary files /dev/null and b/lib/javax.persistence.jar differ
diff --git a/lib/javax.resource.jar b/lib/javax.resource.jar
new file mode 100644
index 0000000000000000000000000000000000000000..696a2345878907025784d2e6e49c6e6b41d1cfac
Binary files /dev/null and b/lib/javax.resource.jar differ
diff --git a/lib/javax.servlet.jar b/lib/javax.servlet.jar
new file mode 100644
index 0000000000000000000000000000000000000000..0519e4a4e16c207f18527175c6a4425b2b1bacbd
Binary files /dev/null and b/lib/javax.servlet.jar differ
diff --git a/lib/javax.servlet.jsp.jar b/lib/javax.servlet.jsp.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9c0631cea0fd56031db19fc3edbb4db4bfbb923a
Binary files /dev/null and b/lib/javax.servlet.jsp.jar differ
diff --git a/lib/javax.servlet.jsp.jstl.jar b/lib/javax.servlet.jsp.jstl.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7be17cc742fde5e957696dd98f6d0cf6520ed294
Binary files /dev/null and b/lib/javax.servlet.jsp.jstl.jar differ
diff --git a/lib/javax.transaction.jar b/lib/javax.transaction.jar
new file mode 100644
index 0000000000000000000000000000000000000000..729c6952389cd4769d5d840b3d1a7941b3c0f63e
Binary files /dev/null and b/lib/javax.transaction.jar differ
diff --git a/src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java b/src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java
index 56fbf94e19288ca61e1b6338c6f5be50ec18d0a7..f3d29c85e97176f00faabf8a89e919d009aded8d 100644
--- a/src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java
+++ b/src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java
@@ -45,7 +45,10 @@ public class SiteConfigApi extends AbstractXapiRestController {
     @PostConstruct
     public void checkForFoundPreferences() {
         if (!_appInfo.isInitialized()) {
-            _found.putAll(_appInfo.getFoundPreferences());
+            Map<String, String> tempPrefs = _appInfo.getFoundPreferences();
+            if(tempPrefs!=null){
+                _found.putAll(tempPrefs);
+            }
             if (_found.size() > 0) {
                 _hasFoundPreferences = true;
             }
diff --git a/src/main/java/org/nrg/xnat/configuration/ApplicationConfig.java b/src/main/java/org/nrg/xnat/configuration/ApplicationConfig.java
index dde0ada29d7a8d5c63544bffa53dc1651b9173de..d3347eba07f22c91464742187d152c6b0235d653 100644
--- a/src/main/java/org/nrg/xnat/configuration/ApplicationConfig.java
+++ b/src/main/java/org/nrg/xnat/configuration/ApplicationConfig.java
@@ -62,8 +62,8 @@ public class ApplicationConfig {
     }
 
     @Bean
-    public AutomationPreferences automationPreferences(final NrgEventService service) {
-        return new AutomationPreferences(service);
+    public AutomationPreferences automationPreferences(final NrgPreferenceService preferenceService, final NrgEventService service) {
+        return new AutomationPreferences(preferenceService, service);
     }
 
     @Bean
diff --git a/src/main/java/org/nrg/xnat/preferences/AutomationPreferences.java b/src/main/java/org/nrg/xnat/preferences/AutomationPreferences.java
index 7e1f88846ef049f1e2aeb7fdbe083220059b90bd..27c9c8fcf68e66d6e74c06e786542ada52a09086 100644
--- a/src/main/java/org/nrg/xnat/preferences/AutomationPreferences.java
+++ b/src/main/java/org/nrg/xnat/preferences/AutomationPreferences.java
@@ -4,6 +4,7 @@ import org.nrg.framework.services.NrgEventService;
 import org.nrg.prefs.annotations.NrgPreference;
 import org.nrg.prefs.annotations.NrgPreferenceBean;
 import org.nrg.prefs.exceptions.InvalidPreferenceName;
+import org.nrg.prefs.services.NrgPreferenceService;
 import org.nrg.xdat.preferences.EventTriggeringAbstractPreferenceBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,8 +19,8 @@ public class AutomationPreferences extends EventTriggeringAbstractPreferenceBean
     public static final String AUTOMATION_TOOL_ID = "automation";
 
     @Autowired
-    public AutomationPreferences(final NrgEventService eventService) {
-        super(eventService);
+    public AutomationPreferences(final NrgPreferenceService preferenceService, final NrgEventService eventService) {
+        super(preferenceService, eventService);
     }
 
     @NrgPreference(defaultValue = "true")
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/AcceptProjectAccess.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/AcceptProjectAccess.java
index d3ee58d874a3e42a520abeb38cb918a519ddbf25..178742953689019c58634cb17d6940d8ead504e6 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/AcceptProjectAccess.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/AcceptProjectAccess.java
@@ -29,6 +29,7 @@ public class AcceptProjectAccess extends SecureAction {
 	@Override
 	public void doPerform(RunData data, Context context) throws Exception {
 		UserI user = (UserI) context.get("user"); //Check the user in the context before XDAT.getUserDetails() because XDAT.getUserDetails() may still be the guest user at this point.
+
 		if (user == null) {
 			user = XDAT.getUserDetails();
         }