diff --git a/src/main/java/org/nrg/xnat/restlet/resources/UserListResource.java b/src/main/java/org/nrg/xnat/restlet/resources/UserListResource.java
index 2eda908e4c661a7100895f5198532bc2f104fe4b..97c99d4689b5e0768ce2dc308c2e4d0d51a0372b 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/UserListResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/UserListResource.java
@@ -81,6 +81,6 @@ public class UserListResource extends SecureResource {
      * @return <b>true</b> if only site administrators can access the list of users, <b>false</b> otherwise.
      */
     private boolean restrictUserListAccessToAdmins() {
-        return XDAT.getBoolSiteConfigurationProperty("restrictUserListAccessToAdmins", true);
+        return XDAT.getSiteConfigPreferences().getRestrictUserListAccessToAdmins();
         }
         }
diff --git a/src/main/java/org/nrg/xnat/security/XnatLdapUserDetailsMapper.java b/src/main/java/org/nrg/xnat/security/XnatLdapUserDetailsMapper.java
index c0768d8673f5845ea0c409b91bd50f3480d29354..313b68e1b474210d2f5b769249ac95fa15627a6a 100644
--- a/src/main/java/org/nrg/xnat/security/XnatLdapUserDetailsMapper.java
+++ b/src/main/java/org/nrg/xnat/security/XnatLdapUserDetailsMapper.java
@@ -77,7 +77,7 @@ public class XnatLdapUserDetailsMapper extends LdapUserDetailsMapper {
 
         try {
             final UserI xdatUser = Users.getUser(userDetails.getUsername());
-            if ((!XDAT.verificationOn() || xdatUser.isVerified()) && userDetails.getAuthorization().isEnabled()) {
+            if ((!XDAT.getSiteConfigPreferences().getEmailVerification() || xdatUser.isVerified()) && userDetails.getAuthorization().isEnabled()) {
                 return userDetails;
             } else {
                 throw new NewLdapAccountNotAutoEnabledException(
diff --git a/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java b/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
index 085bd95ec7b211d353d970e14718a4bc54c5f811..8dac7b2415dfef434d0a4e7f8abfd0775222f286 100644
--- a/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
+++ b/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
@@ -80,7 +80,7 @@ public class XnatDatabaseAuthenticationProvider extends DaoAuthenticationProvide
             throw new AuthenticationServiceException("User details class is not of a type I know how to handle: " + userDetails.getClass());
         }
         final UserI xdatUserDetails = (UserI) userDetails;
-        if ((XDAT.verificationOn() && !xdatUserDetails.isVerified() && xdatUserDetails.isEnabled()) || !xdatUserDetails.isAccountNonLocked()) {
+        if ((XDAT.getSiteConfigPreferences().getEmailVerification() && !xdatUserDetails.isVerified() && xdatUserDetails.isEnabled()) || !xdatUserDetails.isAccountNonLocked()) {
             throw new CredentialsExpiredException("Attempted login to unverified or locked account: " + xdatUserDetails.getUsername());
         }
         super.additionalAuthenticationChecks(userDetails, authentication);
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java
index b61c959281a8ef13a7567c88ec9bf8d04ab9862a..8db9f45c42be833aad9bf5f140c0bc07d34202ec 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java
@@ -10,12 +10,6 @@
  */
 package org.nrg.xnat.turbine.modules.actions;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.turbine.Turbine;
@@ -25,12 +19,17 @@ import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
 import org.nrg.xdat.XDAT;
 import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.XFT;
 import org.nrg.xft.security.UserI;
 import org.nrg.xnat.turbine.utils.ProjectAccessRequest;
 import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
 import org.springframework.security.web.savedrequest.SavedRequest;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class XDATRegisterUser extends org.nrg.xdat.turbine.modules.actions.XDATRegisterUser {
 
     @Override
@@ -94,13 +93,13 @@ public class XDATRegisterUser extends org.nrg.xdat.turbine.modules.actions.XDATR
             context.put("user", user);
             action.doPerform(data, context);
         } else if (!StringUtils.isEmpty(nextAction) && !nextAction.contains("XDATLoginUser") && !nextAction.equals(Turbine.getConfiguration().getString("action.login"))) {
-            if (XDAT.getSiteConfigPreferences().getUserRegistration() & !XDAT.verificationOn()) {
+            if (XDAT.getSiteConfigPreferences().getUserRegistration() & !XDAT.getSiteConfigPreferences().getEmailVerification()) {
                 data.setAction(nextAction);
                 VelocityAction action = (VelocityAction) ActionLoader.getInstance().getInstance(nextAction);
                 action.doPerform(data, context);
             }
         } else if (!StringUtils.isEmpty(nextPage) && !nextPage.equals(Turbine.getConfiguration().getString("template.home"))) {
-            if (XDAT.getSiteConfigPreferences().getUserRegistration() && !XDAT.verificationOn()) {
+            if (XDAT.getSiteConfigPreferences().getUserRegistration() && !XDAT.getSiteConfigPreferences().getEmailVerification()) {
                 data.setScreenTemplate(nextPage);
             }
         }
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadAppletScreen.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadAppletScreen.java
index 743912a9ac7d87995869917082b8510a853597ef..36bb43c1ceb8af03d2103116fba4f02d7f5a444d 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadAppletScreen.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadAppletScreen.java
@@ -50,7 +50,7 @@ public abstract class UploadAppletScreen extends SecureScreen {
             scope = Scope.Site;
         }
 
-        boolean enableProjectAppletScript = XDAT.getBoolSiteConfigurationProperty("enableProjectAppletScript", false);
+        boolean enableProjectAppletScript = XDAT.getSiteConfigPreferences().getEnableProjectAppletScript();
         org.nrg.config.entities.Configuration config = enableProjectAppletScript ? configService.getConfig(AppletConfig.toolName, AppletConfig.path, scope, projectId) : null;
 
         if (config == null || org.nrg.config.entities.Configuration.DISABLED_STRING.equalsIgnoreCase(config.getStatus())) {
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
index 9f08bc2e61c2ba0e68d8c10d6471807d80bdc583..758bf687598bcbf2a9b0c0fc726a5f0d2a96d20a 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
@@ -129,7 +129,7 @@ public class XDATScreen_UpdateUser extends SecureScreen {
                     if(!user.isEnabled()) {
                         throw new Exception("User is not enabled: " + user.getUsername());
                     }
-                    if (XDAT.verificationOn() && !user.isVerified()) {
+                    if (XDAT.getSiteConfigPreferences().getEmailVerification() && !user.isVerified()) {
                         throw new Exception("User is not verified: " + user.getUsername());
                     }
                 }