diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java b/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java
index d6683694a..91d0db38d 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java
@@ -62,9 +62,9 @@ public class TaskanaEngineConfiguration {
   private static final String TASKANA_JOB_PRIORITY_BATCHSIZE = "taskana.jobs.priority.batchSize";
   private static final String TASKANA_JOB_PRIORITY_RUN_EVERY = "taskana.jobs.priority.runEvery";
   private static final String TASKANA_JOB_PRIORITY_FIRST_RUN = "taskana.jobs.priority.firstRunAt";
+  private static final String TASKANA_JOB_PRIORITY_ACTIVE = "taskana.jobs.priority.active";
   private static final String TASKANA_JOB_USER_REFRESH_FIRST_RUN =
       "taskana.jobs.user.refresh.firstRunAt";
-  private static final String TASKANA_JOB_PRIORITY_ACTIVE = "taskana.jobs.priority.active";
   private static final String TASKANA_JOB_USER_REFRESH_RUN_EVERY =
       "taskana.jobs.user.refresh.runEvery";
   private static final String TASKANA_DOMAINS_PROPERTY = "taskana.domains";
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java
index a088f227e..d34b1d2d8 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java
@@ -141,13 +141,10 @@ public class LdapClient {
           userOrGroupFilter.or(new EqualsFilter(getUserIdAttribute(), userOrGroup));
         });
 
-    final AndFilter andFilter = new AndFilter();
-    andFilter.and(userOrGroupFilter);
-
     final List<User> users =
         ldapTemplate.search(
             getUserSearchBase(),
-            andFilter.encode(),
+            userOrGroupFilter.encode(),
             SearchControls.SUBTREE_SCOPE,
             getLookUpUserInfoAttributesToReturn(),
             new UserInfoContextMapper());
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/user/jobs/UserInfoRefreshJob.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/user/jobs/UserInfoRefreshJob.java
index a6bed31d9..a408ff5dd 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/user/jobs/UserInfoRefreshJob.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/user/jobs/UserInfoRefreshJob.java
@@ -98,7 +98,13 @@ public class UserInfoRefreshJob extends AbstractTaskanaJob {
     users.forEach(
         user -> {
           try {
+            if (LOGGER.isDebugEnabled()) {
+              LOGGER.debug("Trying to insert user {}", user);
+            }
             taskanaEngineImpl.getUserService().createUser(user);
+            if (LOGGER.isDebugEnabled()) {
+              LOGGER.debug("Successfully inserted user {}", user);
+            }
           } catch (InvalidArgumentException
               | NotAuthorizedException
               | UserAlreadyExistException e) {
@@ -112,7 +118,17 @@ public class UserInfoRefreshJob extends AbstractTaskanaJob {
     users.forEach(
         user -> {
           try {
-            user.setData(taskanaEngineImpl.getUserService().getUser(user.getId()).getData());
+
+            String userData = taskanaEngineImpl.getUserService().getUser(user.getId()).getData();
+            if (userData != null) {
+              if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("Trying to set userData {} for user {}", userData, user);
+              }
+              user.setData(taskanaEngineImpl.getUserService().getUser(user.getId()).getData());
+              if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("Successfully set userData {} for user {}", userData, user);
+              }
+            }
           } catch (UserNotFoundException e) {
             if (LOGGER.isDebugEnabled()) {
               LOGGER.debug(