Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rbb6788de1fe910e6ab6fb14bb54b5e21551392de -r8dac82ff3870ff39cd41d273bf22f290b66994c5
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bb6788de1fe910e6ab6fb14bb54b5e21551392de)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8dac82ff3870ff39cd41d273bf22f290b66994c5)
@@ -445,4 +445,5 @@
 message.disclose.correct.before.groups.answers = Usually other groups' answers are disclosed before correct answers so students can discuss their choices. Are you sure you want continue?
 label.vsa.allocate.button = Allocate VSAs
 label.vsa.allocate.description = Allocate students' answers by dragging and dropping them to correct options
-label.vsa.deallocate.button.tip = Click to move answer back to queue
\ No newline at end of file
+label.vsa.deallocate.button.tip = Click to move answer back to queue
+label.vsa.deallocate.confirm = Are you sure you want to mark this answer as not correct? Students' scores will be recalculated.
\ No newline at end of file
Index: lams_tool_assessment/web/includes/javascript/vsaAllocate.js
===================================================================
diff -u -rea355e79020de11b00f2acf713ed79ec603d7679 -r8dac82ff3870ff39cd41d273bf22f290b66994c5
--- lams_tool_assessment/web/includes/javascript/vsaAllocate.js	(.../vsaAllocate.js)	(revision ea355e79020de11b00f2acf713ed79ec603d7679)
+++ lams_tool_assessment/web/includes/javascript/vsaAllocate.js	(.../vsaAllocate.js)	(revision 8dac82ff3870ff39cd41d273bf22f290b66994c5)
@@ -42,13 +42,18 @@
 			container = button.closest('.answer-alternatives'),
 			questionUid = container.data('question-uid'),
 			optionUid = container.data('option-uid'),
+			isCorrect = container.data('option-correct'),
 			data = {
 	            	questionUid: questionUid,
 	            	targetOptionUid: -1,
 	            	previousOptionUid: optionUid,
 	            	answer: answer
 				    };
 
+		if (isCorrect && !confirm(VS_ANSWER_DEALLOCATE_CONFIRM)) {
+			return;
+		}
+		
 		data[csrfTokenName] = csrfTokenValue;
 				
         $.ajax({
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -rea355e79020de11b00f2acf713ed79ec603d7679 -r8dac82ff3870ff39cd41d273bf22f290b66994c5
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision ea355e79020de11b00f2acf713ed79ec603d7679)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 8dac82ff3870ff39cd41d273bf22f290b66994c5)
@@ -56,6 +56,7 @@
 
 			//vars for VSA allocation
 			var VS_ANSWER_ALLOCATED_ALERT = "<fmt:message key="label.someone.allocated.this.answer" />",
+				VS_ANSWER_DEALLOCATE_CONFIRM = "<fmt:message key="label.vsa.deallocate.confirm" />",
 				WEB_APP_URL = "<lams:WebAppURL />",
 				csrfTokenName = "<csrf:tokenname/>",
 				csrfTokenValue = "<csrf:tokenvalue/>";
@@ -66,7 +67,7 @@
 	 	<script type="text/javascript" src="${lams}includes/javascript/Sortable.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script> 	
-		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/vsaAllocate.js"></script>
+		<lams:JSImport src="includes/javascript/vsaAllocate.js" relative="true" />
 
 		<c:if test="${not empty questionDto.codeStyle}">
 			<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/runmode/runmode-standalone.js"></script>
Index: lams_tool_assessment/web/pages/monitoring/parts/vsaQuestionAllocate.jsp
===================================================================
diff -u -rea355e79020de11b00f2acf713ed79ec603d7679 -r8dac82ff3870ff39cd41d273bf22f290b66994c5
--- lams_tool_assessment/web/pages/monitoring/parts/vsaQuestionAllocate.jsp	(.../vsaQuestionAllocate.jsp)	(revision ea355e79020de11b00f2acf713ed79ec603d7679)
+++ lams_tool_assessment/web/pages/monitoring/parts/vsaQuestionAllocate.jsp	(.../vsaQuestionAllocate.jsp)	(revision 8dac82ff3870ff39cd41d273bf22f290b66994c5)
@@ -42,7 +42,8 @@
 					<fmt:message key="label.answer.alternatives" />:
 					<div class="answer-alternatives" id="answer-alternatives${option0.uid}"
 						 data-question-uid="${questionDto.uid}"
-						 data-option-uid="${option0.uid}">
+						 data-option-uid="${option0.uid}"
+						 data-option-correct="${option0.maxMark > 0}">
 						<c:forEach var="answer" items="${fn:split(option0.name, newLineChar)}">
 							<button type="button" class="btn btn-xs ${questionSummary.tbl ? 'btn-success' : 'btn-primary'}"
 									title='<fmt:message key="label.vsa.deallocate.button.tip" />'>${answer}</button>
@@ -94,7 +95,8 @@
 					<fmt:message key="label.answer.alternatives" />:
 					<div class="answer-alternatives" id="answer-alternatives${option0.uid}"
 						 data-question-uid="${questionDto.uid}"
-						 data-option-uid="${option1.uid}">
+						 data-option-uid="${option1.uid}"
+						 data-option-correct="${option1.maxMark > 0}">
 						<c:forEach var="answer" items="${fn:split(option1.name, newLineChar)}">
 							<button type="button" class="btn btn-xs ${questionSummary.tbl ? 'btn-danger' : 'btn-primary'}"
 									title='<fmt:message key="label.vsa.deallocate.button.tip" />'>${answer}</button>
@@ -122,7 +124,8 @@
 					<fmt:message key="label.answer.alternatives" />:
 					<div class="answer-alternatives" id="answer-alternatives${optionDto.uid}"
 						 data-question-uid="${questionDto.uid}"
-						 data-option-uid="${optionDto.uid}">
+						 data-option-uid="${optionDto.uid}"
+						 data-option-correct="${optionDto.maxMark > 0}">
 						<c:forEach var="answer" items="${fn:split(optionDto.name, newLineChar)}">
 							<button type="button" class="btn btn-xs btn-primary"
 									title='<fmt:message key="label.vsa.deallocate.button.tip" />'>${answer}</button>
Index: lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp
===================================================================
diff -u -rea355e79020de11b00f2acf713ed79ec603d7679 -r8dac82ff3870ff39cd41d273bf22f290b66994c5
--- lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp	(.../vsaAllocate.jsp)	(revision ea355e79020de11b00f2acf713ed79ec603d7679)
+++ lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp	(.../vsaAllocate.jsp)	(revision 8dac82ff3870ff39cd41d273bf22f290b66994c5)
@@ -24,6 +24,7 @@
 	 	<script type="text/javascript" src="${lams}includes/javascript/Sortable.js"></script>
   	    <script>
 			var VS_ANSWER_ALLOCATED_ALERT = "<fmt:message key="label.someone.allocated.this.answer" />",
+				VS_ANSWER_DEALLOCATE_CONFIRM = "<fmt:message key="label.vsa.deallocate.confirm" />",
 				WEB_APP_URL = "<lams:WebAppURL />",
 				csrfTokenName = "<csrf:tokenname/>",
 				csrfTokenValue = "<csrf:tokenvalue/>";
@@ -36,7 +37,7 @@
 	   			self.parent.tb_remove();
 	   		}
   		</script>
-  		<script src="<lams:WebAppURL />includes/javascript/vsaAllocate.js"></script>
+  		<lams:JSImport src="includes/javascript/vsaAllocate.js" relative="true" />
 	</lams:head>
 	
 <body>