diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java
index 641d6d3..77cf1b4 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java
@@ -382,17 +382,18 @@
 			if (currentPosition == -1) {
 				this.createMsgGroupLeaderChanged(userRepository.findOne(lastStartUserId), lsUserInGroup);
 				currentPosition = 0;
+				UserInStandbyGroup uisg = lsUserInGroup.get(currentPosition);
+				lastStartUserId = uisg.getUser().getId();
 			}
 			Date tmpDate = dto.getStartDate();
 
-			PlanningBodyResultDto planningBodyResultDto = null;
+			PlanningBodyResultDto planningBodyResultDto = new PlanningBodyResultDto();
 			while (tmpDate.getTime() < dto.getEndDate().getTime()) {
 
 				// reset position if end of list has been reached
 				planningBodyResultDto = this.calculateScheduleBodyEntries(lsUserInGroup, dto.getStartDate(), tmpDate,
 						lastCalcDate, lastTurnUserId, username, lastStartUserId, phaseNumber);
 				tmpDate = planningBodyResultDto.getTempDate();
-				currentPosition = planningBodyResultDto.getNewPosition();
 				lastStartUserId = planningBodyResultDto.getLastStartUserId();
 				lastTurnUserId = planningBodyResultDto.getLastUserId();