Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
===================================================================
diff -u -re62e56b0f0d04f6820592e95b0271619784a2c9f -r536190f16e09f9b9e916ef3cf70cceda1c5ac810
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision e62e56b0f0d04f6820592e95b0271619784a2c9f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision 536190f16e09f9b9e916ef3cf70cceda1c5ac810)
@@ -1187,21 +1187,23 @@
 	user.setLearnerFinished(true);
 	updateUser(user);
 
-	//if this is a leader finishes, complete all non-leaders as well, also copy leader results to them
+	//if this is a leader finished, complete all non-leaders as well, also copy leader results to them
 	QaSession session = user.getQaSession();
-	QaQueUsr groupLeader = checkLeaderSelectToolForSessionLeader(user, toolSessionID);
-	if (isUserGroupLeader(userID, toolSessionID)) {
-	    session.getQaQueUsers().forEach(sessionUser -> {
-		//finish users
-		sessionUser.setResponseFinalized(true);
-		sessionUser.setLearnerFinished(true);
-		updateUser(user);
+	if (session.getQaContent().isUseSelectLeaderToolOuput()) {
+	    QaQueUsr groupLeader = checkLeaderSelectToolForSessionLeader(user, toolSessionID);
+	    if (isUserGroupLeader(userID, toolSessionID)) {
+		session.getQaQueUsers().forEach(sessionUser -> {
+		    //finish users
+		    sessionUser.setResponseFinalized(true);
+		    sessionUser.setLearnerFinished(true);
+		    updateUser(user);
 
-		//copy answers from leader to non-leaders
-		copyAnswersFromLeader(sessionUser, groupLeader);
-	    });
+		    //copy answers from leader to non-leaders
+		    copyAnswersFromLeader(sessionUser, groupLeader);
+		});
+	    }
 	}
-
+	
 	//return nextActivityUrl
 	return leaveToolSession(toolSessionID, userID);
     }