Index: lams_central/web/includes/javascript/qb-question.js
===================================================================
diff -u -re11f383d97ca45f4fc0d1c8a283b306439dff946 -r70a326811aab339193f6031102dfde367b21cc5c
--- lams_central/web/includes/javascript/qb-question.js	(.../qb-question.js)	(revision e11f383d97ca45f4fc0d1c8a283b306439dff946)
+++ lams_central/web/includes/javascript/qb-question.js	(.../qb-question.js)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
@@ -10,14 +10,14 @@
 	$("#question-settings-link").on('click', function() {
 		$('.question-tab:visible').fadeToggle("fast", function() {
 			$( ".settings-tab" ).show();
-	    });
+		});
 		$('.settings-tab:visible').fadeToggle("fast", function() {
 			$( ".question-tab" ).show();
-	    });
+		});
 
 		//toggle Settings button class
 		$(this).toggleClass("btn-default btn-primary");
-	});	
+	});
 
 	// trigger is-new-question-version check when changing certain data in a question
 	$('#assessmentQuestionForm').on('input', 'input, select, textarea', function(){
@@ -28,21 +28,66 @@
 	$('body').on('input paste', '[contenteditable]', function(){
 		checkQuestionNewVersion(false);
 	});
+
+	$('#collection-uid-select').change(function(){
+		let collectionSelect = $(this),
+			newValue = collectionSelect.val(),
+			previouslySelectedOption = $('option[selected]', collectionSelect);
+		if (newValue == -1) {
+			// create a new collection on the fly
+			let newCollectionName = prompt(ADD_COLLECTION_LABEL),
+				newCollectionUid = -1;
+			if (newCollectionName) {
+				newCollectionName = newCollectionName.trim();
+				let data = {
+					'name' : newCollectionName
+				};
+				data[csrfTokenName] = csrfTokenValue;
+
+				$.ajax({
+					'url' : LAMS_URL + 'qb/collection/addCollection.do',
+					'async' : false,
+					'type' : 'post',
+					'dataType' : 'text',
+					'data' : data,
+					success : function (response){
+						if (!isNaN(response)) {
+							newCollectionUid = +response;
+						}
+					},
+					error : function (xhr) {
+						alert(xhr.responseText);
+					}
+				});
+			}
+
+			if (newCollectionUid == -1 || newCollectionUid == 0) {
+				// revert to previous selection
+				previouslySelectedOption.prop('selected', true);
+			} else {
+				$('<option>').attr('value', newCollectionUid).attr('selected', 'selected')
+					.prop('selected', true).text(newCollectionName).insertBefore($('option[value="-1"]', collectionSelect));
+			}
+		} else {
+			previouslySelectedOption.removeAttr('selected');
+			$('option[value="' + newValue + '"]', collectionSelect).attr('selected', 'selected');
+		}
+	});
 });
 
 // submits whole question form in order to check if it changed enough to produce a new question version
 function checkQuestionNewVersion(quick){
 	if (isNewQuestion) {
 		return;
 	}
-	
+
 	let currentTime = new Date().getTime();
 	// skip initial check of new version
 	if (currentTime < newQuestionVersionCheckTime || (!quick && currentTime - newQuestionVersionCheckTime < newQuestionVersionCheckThrottle)) {
 		return;
 	}
 	newQuestionVersionCheckTime = currentTime;
-	
+
 	let form = $('#assessmentQuestionForm'),
 		validator = form.data('validator');
 	if (!validator) {
@@ -54,11 +99,11 @@
 }
 
 function isVersionCheck() {
-	return $('#assessmentQuestionForm').attr('action') == CHECK_QUESTION_NEW_VERSION_URL;	
+	return $('#assessmentQuestionForm').attr('action') == CHECK_QUESTION_NEW_VERSION_URL;
 }
 
 // post-submit callback 
-function afterRatingSubmit(responseText, statusText)  { 
+function afterRatingSubmit(responseText, statusText)  {
 	self.parent.refreshThickbox()
 	self.parent.tb_remove();
 }
@@ -73,29 +118,29 @@
 
 //form validation handler. It's called when the form contains an error.
 function formValidationInvalidHandler(form, validator) {
-    var errors = validator.numberOfInvalids();
-    if (errors) {
-        var message = errors == 1
+	var errors = validator.numberOfInvalids();
+	if (errors) {
+		var message = errors == 1
 			? VALIDATION_ERROR_LABEL
-          	: VALIDATION_ERRORS_LABEL.replace("{errors_counter}", errors);
-      	  
-        $("div.error span").html(message);
-        $("div.error").show();
-          
-        //show/hide settings tab, if it contains an error
-        var showSettingsTab = true;
-        $.each(validator.errorMap, function(key, value) {
-        	showSettingsTab &= key == "maxMark" || key == "penaltyFactor";
-        });
-        if (showSettingsTab) {
-        	$("#question-settings-link.btn-default").trigger( "click" );
-        } else {
-        	$("#question-settings-link.btn-primary").trigger( "click" );
-	    }
-          
-    } else {
-        $("div.error").hide();
-    }
+			: VALIDATION_ERRORS_LABEL.replace("{errors_counter}", errors);
+
+		$("div.error span").html(message);
+		$("div.error").show();
+
+		//show/hide settings tab, if it contains an error
+		var showSettingsTab = true;
+		$.each(validator.errorMap, function(key, value) {
+			showSettingsTab &= key == "maxMark" || key == "penaltyFactor";
+		});
+		if (showSettingsTab) {
+			$("#question-settings-link.btn-default").trigger( "click" );
+		} else {
+			$("#question-settings-link.btn-primary").trigger( "click" );
+		}
+
+	} else {
+		$("div.error").hide();
+	}
 }
 function formValidationErrorPlacement( error, element ) {
 	// Add the `help-block` class to the error element
@@ -123,4 +168,4 @@
 function formValidationUnhighlight ( element, errorClass, validClass ) {
 	$( element ).parent().addClass( "has-success" ).removeClass( "has-error" );
 	$( element ).not(".fake-validation-input").next( "span" ).addClass( "fa-check" ).removeClass( "fa-remove" );
-}
+}
\ No newline at end of file
Index: lams_central/web/qb/authoring/addQuestionFooter.jsp
===================================================================
diff -u -rc04504bfdd9685850e15792838241a748f13560e -r70a326811aab339193f6031102dfde367b21cc5c
--- lams_central/web/qb/authoring/addQuestionFooter.jsp	(.../addQuestionFooter.jsp)	(revision c04504bfdd9685850e15792838241a748f13560e)
+++ lams_central/web/qb/authoring/addQuestionFooter.jsp	(.../addQuestionFooter.jsp)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
@@ -25,6 +25,10 @@
 								</c:if>
 						</option>
 					</c:forEach>
+					<c:if test="${allowCreatingQbCollections}">
+						<fmt:message key="label.questions.choice.collection.new.option" var="newOptionLabel"/>
+						<option value="-1"><c:out escapeXml="true" value="${newOptionLabel}" /></option>
+					</c:if>
 				</select>
 			</span>
 				
Index: lams_central/web/qb/authoring/addQuestionHeader.jsp
===================================================================
diff -u -rdab57abcc025fa02ac2cc688421251f51c8942cf -r70a326811aab339193f6031102dfde367b21cc5c
--- lams_central/web/qb/authoring/addQuestionHeader.jsp	(.../addQuestionHeader.jsp)	(revision dab57abcc025fa02ac2cc688421251f51c8942cf)
+++ lams_central/web/qb/authoring/addQuestionHeader.jsp	(.../addQuestionHeader.jsp)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
@@ -1,8 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<c:set var="allowCreatingQbCollections"><%=Configuration.get(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW)%></c:set>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="isNewQuestion" value="${assessmentQuestionForm.uid eq -1}" />
 
- <!-- ********************  CSS ********************** -->
+<!-- ********************  CSS ********************** -->
 <lams:css />
 <link href="<lams:LAMSURL/>/tool/laasse10/includes/css/assessment.css" rel="stylesheet" type="text/css">
 <link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />
@@ -14,25 +17,29 @@
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 <script type="text/javascript">
-	const QUESTION_TYPE = ${questionType};
-	const ADD_OPTION_URL = "/lams/qb/edit/addOption.do";
-	const CHECK_QUESTION_NEW_VERSION_URL = "/lams/qb/edit/checkQuestionNewVersion.do";
-	const SAVE_QUESTION_URL = "/lams/qb/edit/saveOrUpdateQuestion.do";
-	const CONFIRM_DELETE_ANSWER_LABEL = "<fmt:message key="label.do.you.want.to.delete.answer"></fmt:message>";
-	const SLIDER_NONE_LABEL = "<fmt:message key="label.authoring.basic.none" />";
-	const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
-	const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
+ const QUESTION_TYPE = ${questionType};
+ const ADD_OPTION_URL = "/lams/qb/edit/addOption.do";
+ const CHECK_QUESTION_NEW_VERSION_URL = "/lams/qb/edit/checkQuestionNewVersion.do";
+ const SAVE_QUESTION_URL = "/lams/qb/edit/saveOrUpdateQuestion.do";
+ const CONFIRM_DELETE_ANSWER_LABEL = "<fmt:message key="label.do.you.want.to.delete.answer"></fmt:message>";
+ const SLIDER_NONE_LABEL = "<fmt:message key="label.authoring.basic.none" />";
+ const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
+ const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
+ const ADD_COLLECTION_LABEL = '<fmt:message key="label.questions.choice.collection.new.prompt" />';
+ const LAMS_URL = '<lams:LAMSURL/>';
 
-	var isNewQuestion = ${isNewQuestion};
-	
-	function saveQuestion(isNewVersion) {
-		let form = $('#assessmentQuestionForm');
-		if (isNewVersion) {
-			action = form.attr('action');
-			form.attr('action', action + '?newVersion=true');
-		}
-		form.submit();
-	}
+ var isNewQuestion = ${isNewQuestion},
+         csrfTokenName = '<csrf:tokenname/>',
+         csrfTokenValue = '<csrf:tokenvalue/>';
+
+ function saveQuestion(isNewVersion) {
+  let form = $('#assessmentQuestionForm');
+  if (isNewVersion) {
+   action = form.attr('action');
+   form.attr('action', action + '?newVersion=true');
+  }
+  form.submit();
+ }
 </script>
 <lams:JSImport src="includes/javascript/qb-question.js" />
 <lams:JSImport src="includes/javascript/qb-option.js" />
Index: lams_central/web/qb/authoring/addessay.jsp
===================================================================
diff -u -r62136ef7274ade99c326404298d51c77085cffcb -r70a326811aab339193f6031102dfde367b21cc5c
--- lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 62136ef7274ade99c326404298d51c77085cffcb)
+++ lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
@@ -1,153 +1,161 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<c:set var="allowCreatingQbCollections"><%=Configuration.get(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW)%></c:set>
 <c:set var="isNewQuestion" value="${assessmentQuestionForm.uid eq -1}" />
 
 <lams:html>
-<lams:head>
-	<lams:css />
-	<link href="<lams:LAMSURL/>tool/laasse10/includes/css/assessment.css" rel="stylesheet" type="text/css">
-	<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css">
-	<link href="<lams:LAMSURL/>css/qb-question.css" rel="stylesheet" type="text/css">
+	<lams:head>
+		<lams:css />
+		<link href="<lams:LAMSURL/>tool/laasse10/includes/css/assessment.css" rel="stylesheet" type="text/css">
+		<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css">
+		<link href="<lams:LAMSURL/>css/qb-question.css" rel="stylesheet" type="text/css">
 
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
-	<script type="text/javascript">
-		const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
-		const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
-		var isNewQuestion = ${isNewQuestion};
-	</script>
-	<lams:JSImport src="includes/javascript/qb-question.js" />
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-    <script>
-		$(document).ready(function(){
-		    $("#assessmentQuestionForm").validate({
-		    	ignore: 'hidden, div.cke_editable',
-		    	rules: {
-		    		title: "required",
-		    		maxMark: {
-		    			required: true,
-		    		    digits: true
-		    		},
-		    		maxWordsLimit: {
-		    		    digits: true
-		    		},
-		    		minWordsLimit: {
-		    		    digits: true
-		    		}
-		    	},
-	    		messages: {
-	    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
-	    			maxMark: {
-	    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-	    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
-	    			}
-	    		},
-   			    submitHandler: function(form) {
-	    			$("#description").val(CKEDITOR.instances.description.getData());
-	    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
-	    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
-	     			    
-	    	    	var options = { 
-	    	    		target:  parent.jQuery('#itemArea'), 
-	    		   		success: afterRatingSubmit  // post-submit callback
-	    		    }; 				
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
+		<script type="text/javascript">
+			const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
+			const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
+			const ADD_COLLECTION_LABEL = '<fmt:message key="label.questions.choice.collection.new.prompt" />';
+			const LAMS_URL = '<lams:LAMSURL/>';
 
-	    			$('#assessmentQuestionForm').ajaxSubmit(options);
-	    		},
-	    		invalidHandler: formValidationInvalidHandler,
-				errorElement: "em",
-				errorPlacement: formValidationErrorPlacement,
-				highlight: formValidationHighlight,
-				unhighlight: formValidationUnhighlight
-		  	});
-		    	
-		   	//spinner
-	    	var validateMinMax = function() {
-	    		// min can't be more than max
-	    		var min = $( "#min-words-limit" ),
-	    			max = $( "#max-words-limit" ),
-	    			minVal = +min.val(),
-	    			maxVal = +max.val();
-	    		if (minVal > maxVal){
-	    			max.val(minVal);
-	    		}
-	    	},
-		    	maximumWordsSpinner = $( "#max-words-limit" ).spinner({ 
-			   		min: 0,
-			   		disabled: ($( "#max-words-limit" ).val() == 0),
-			   		change: validateMinMax,
-			   		stop: validateMinMax
-		    	}),
-		    	minimumWordsSpinner = $( "#min-words-limit" ).spinner({ 
-			   		min: 0,
-			   		disabled: ($( "#min-words-limit" ).val() == 0),
-			   		change: validateMinMax,
-			   		stop: validateMinMax
-		    	});
-	    	$("#max-words-limit-checkbox").click(function() {
-	    		if ( maximumWordsSpinner.spinner( "option", "disabled" ) ) {
-	    			 maximumWordsSpinner.spinner( "enable" );
-	    		} else {
-	    			maximumWordsSpinner.spinner( "disable" );
-	    		}
-	        });
-		    	
-		    //spinner
-	    	$("#min-words-limit-checkbox").click(function() {
-	    		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
-	    			minimumWordsSpinner.spinner( "enable" );
-	    		} else {
-	    			minimumWordsSpinner.spinner( "disable" );
-	    		}
-	        });
+			var isNewQuestion = ${isNewQuestion},
+					csrfTokenName = '<csrf:tokenname/>',
+					csrfTokenValue = '<csrf:tokenvalue/>';
+		</script>
+		<lams:JSImport src="includes/javascript/qb-question.js" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+		<script>
+			$(document).ready(function(){
+				$("#assessmentQuestionForm").validate({
+					ignore: 'hidden, div.cke_editable',
+					rules: {
+						title: "required",
+						maxMark: {
+							required: true,
+							digits: true
+						},
+						maxWordsLimit: {
+							digits: true
+						},
+						minWordsLimit: {
+							digits: true
+						}
+					},
+					messages: {
+						title: "<fmt:message key='label.authoring.choice.field.required'/>",
+						maxMark: {
+							required: "<fmt:message key='label.authoring.choice.field.required'/>",
+							digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
+						}
+					},
+					submitHandler: function(form) {
+						$("#description").val(CKEDITOR.instances.description.getData());
+						$("#feedback").val(CKEDITOR.instances.feedback.getData());
+						$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 
-	        $('#codeStyle').change(function(){
-		        let codeStyle = $(this).val();
+						var options = {
+							target:  parent.jQuery('#itemArea'),
+							success: afterRatingSubmit  // post-submit callback
+						};
 
-		        // if code style is selected, there are no restrictions on number of words and no usage of CKEditor
-		        if (codeStyle > 0) {
-		        	$("#min-words-limit-checkbox, #max-words-limit-checkbox, #allow-rich-editor").prop({
-			        	'checked' : false,
-			        	'disabled': true
-			        });
-		        	maximumWordsSpinner.spinner('disable');
-		        	minimumWordsSpinner.spinner('disable');
-			    } else {
-		        	$("#min-words-limit-checkbox, #max-words-limit-checkbox, #allow-rich-editor").prop({
-			        	'disabled': false
-			        });
-				}
-		    }).change();
+						$('#assessmentQuestionForm').ajaxSubmit(options);
+					},
+					invalidHandler: formValidationInvalidHandler,
+					errorElement: "em",
+					errorPlacement: formValidationErrorPlacement,
+					highlight: formValidationHighlight,
+					unhighlight: formValidationUnhighlight
+				});
 
-	        $('#saveAsButton').show();
-		});
-		
-		
-		function saveQuestion(isNewVersion) {
-			let form = $('#assessmentQuestionForm');
-			if (isNewVersion) {
-				action = form.attr('action');
-				form.attr('action', action + '?newVersion=true');
+				//spinner
+				var validateMinMax = function() {
+							// min can't be more than max
+							var min = $( "#min-words-limit" ),
+									max = $( "#max-words-limit" ),
+									minVal = +min.val(),
+									maxVal = +max.val();
+							if (minVal > maxVal){
+								max.val(minVal);
+							}
+						},
+						maximumWordsSpinner = $( "#max-words-limit" ).spinner({
+							min: 0,
+							disabled: ($( "#max-words-limit" ).val() == 0),
+							change: validateMinMax,
+							stop: validateMinMax
+						}),
+						minimumWordsSpinner = $( "#min-words-limit" ).spinner({
+							min: 0,
+							disabled: ($( "#min-words-limit" ).val() == 0),
+							change: validateMinMax,
+							stop: validateMinMax
+						});
+				$("#max-words-limit-checkbox").click(function() {
+					if ( maximumWordsSpinner.spinner( "option", "disabled" ) ) {
+						maximumWordsSpinner.spinner( "enable" );
+					} else {
+						maximumWordsSpinner.spinner( "disable" );
+					}
+				});
+
+				//spinner
+				$("#min-words-limit-checkbox").click(function() {
+					if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+						minimumWordsSpinner.spinner( "enable" );
+					} else {
+						minimumWordsSpinner.spinner( "disable" );
+					}
+				});
+
+				$('#codeStyle').change(function(){
+					let codeStyle = $(this).val();
+
+					// if code style is selected, there are no restrictions on number of words and no usage of CKEditor
+					if (codeStyle > 0) {
+						$("#min-words-limit-checkbox, #max-words-limit-checkbox, #allow-rich-editor").prop({
+							'checked' : false,
+							'disabled': true
+						});
+						maximumWordsSpinner.spinner('disable');
+						minimumWordsSpinner.spinner('disable');
+					} else {
+						$("#min-words-limit-checkbox, #max-words-limit-checkbox, #allow-rich-editor").prop({
+							'disabled': false
+						});
+					}
+				}).change();
+
+				$('#saveAsButton').show();
+			});
+
+
+			function saveQuestion(isNewVersion) {
+				let form = $('#assessmentQuestionForm');
+				if (isNewVersion) {
+					action = form.attr('action');
+					form.attr('action', action + '?newVersion=true');
+				}
+				form.submit();
 			}
-			form.submit();
-		}
-  	</script>
-</lams:head>
-	
-<body>
+		</script>
+	</lams:head>
+
+	<body>
 	<div class="panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.essay" />
 		</div>
-			
+
 		<div class="panel-body">
-			
-			<form:form action="/lams/qb/edit/saveOrUpdateQuestion.do" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm" 
-				method="post" autocomplete="off">
+
+			<form:form action="/lams/qb/edit/saveOrUpdateQuestion.do" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm"
+					   method="post" autocomplete="off">
 				<form:hidden path="authoringRestricted"/>
 				<form:hidden path="sessionMapID" />
 				<form:hidden path="uid" />
@@ -161,120 +169,120 @@
 				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
 					<fmt:message key="label.settings" />
 				</button>
-				
+
 				<div class="question-tab">
 					<lams:errors/>
-					 <div class="error">
-				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+					<div class="error">
+						<lams:Alert id="errorMessages" type="danger" close="false" >
 							<span></span>
-						</lams:Alert>	
-				    </div>
-					
+						</lams:Alert>
+					</div>
+
 					<div id="title-container" class="form-group">
 						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
-					    <form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255" 
-					    	placeholder="${TITLE_LABEL}"/>
+						<form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255"
+									placeholder="${TITLE_LABEL}"/>
 					</div>
-				
+
 					<div class="form-group form-group-cke">
 						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
-						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
-							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}"
+									   placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
 				</div>
-				
+
 				<div class="settings-tab">
 					<div class="error">
-				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+						<lams:Alert id="errorMessages" type="danger" close="false" >
 							<span></span>
-						</lams:Alert>	
-				    </div>
-	
+						</lams:Alert>
+					</div>
+
 					<c:if test="${!assessmentQuestionForm.authoringRestricted}">
 						<div class="form-group row form-inline">
-						    <label for="maxMark" class="col-sm-3">
-						    	<fmt:message key="label.authoring.basic.default.question.grade" />
-						    	<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-						    </label>
-						    
-						    <div class="col-sm-9">
-						    	<form:input path="maxMark" cssClass="form-control short-input-text input-sm"/>
-						    </div>
+							<label for="maxMark" class="col-sm-3">
+								<fmt:message key="label.authoring.basic.default.question.grade" />
+								<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+							</label>
+
+							<div class="col-sm-9">
+								<form:input path="maxMark" cssClass="form-control short-input-text input-sm"/>
+							</div>
 						</div>
 					</c:if>
-					
+
 					<div class="form-group row form-inline">
-					    <label for="codeStyle" class="col-sm-3">
-					    	<fmt:message key="label.code.style" />
-					    </label>
-					    
-					    <div class="col-sm-9">
-					    	<form:select path="codeStyle" cssClass="form-control">
-					    		<form:option value="0"><fmt:message key="label.code.style.none" /></form:option>
-					    		<form:option value="1">Python</form:option>
-					    		<form:option value="2">JavaScript</form:option>
-					    		<form:option value="3">Java</form:option>
-					    		<form:option value="4">Scala</form:option>
-					    		<form:option value="5">Kotlin</form:option>
-					    		<form:option value="6">C</form:option>
-					    		<form:option value="7">Objective C</form:option>
-					    		<form:option value="8">C++</form:option>
-					    		<form:option value="9">C#</form:option>
-					    	</form:select>
-					    </div>
+						<label for="codeStyle" class="col-sm-3">
+							<fmt:message key="label.code.style" />
+						</label>
+
+						<div class="col-sm-9">
+							<form:select path="codeStyle" cssClass="form-control">
+								<form:option value="0"><fmt:message key="label.code.style.none" /></form:option>
+								<form:option value="1">Python</form:option>
+								<form:option value="2">JavaScript</form:option>
+								<form:option value="3">Java</form:option>
+								<form:option value="4">Scala</form:option>
+								<form:option value="5">Kotlin</form:option>
+								<form:option value="6">C</form:option>
+								<form:option value="7">Objective C</form:option>
+								<form:option value="8">C++</form:option>
+								<form:option value="9">C#</form:option>
+							</form:select>
+						</div>
 					</div>
-					
+
 					<div>
 						<label class="switch">
 							<form:checkbox path="allowRichEditor" id="allow-rich-editor"/>
 							<span class="switch-slider round"></span>
 						</label>
-						<label for="allow-rich-editor">		
+						<label for="allow-rich-editor">
 							<fmt:message key="label.authoring.basic.allow.learners.rich.editor" />
 						</label>
 					</div>
 
-					
+
 					<div class="form-group row form-inline" style="display: flex; align-items: center;">
-					    <label for="max-words-limit-checkbox" class="col-sm-3">
+						<label for="max-words-limit-checkbox" class="col-sm-3">
 							<input type="checkbox" id="max-words-limit-checkbox" name="noname"
-								<c:if test="${assessmentQuestionForm.maxWordsLimit != 0}">checked="checked"</c:if>/>
-					    	<fmt:message key="label.maximum.number.words" />
-					    </label>
-					    
-					    <div class="col-sm-9">
-					   		<form:input path="maxWordsLimit" id="max-words-limit"/>
-					    	<label id="max-words-limit-error" class="alert alert-danger" for="max-words-limit" style="display: none;"></label>
-					    </div>
+								   <c:if test="${assessmentQuestionForm.maxWordsLimit != 0}">checked="checked"</c:if>/>
+							<fmt:message key="label.maximum.number.words" />
+						</label>
+
+						<div class="col-sm-9">
+							<form:input path="maxWordsLimit" id="max-words-limit"/>
+							<label id="max-words-limit-error" class="alert alert-danger" for="max-words-limit" style="display: none;"></label>
+						</div>
 					</div>
-					
+
 					<div class="form-group row form-inline" style="display: flex; align-items: center;">
-					    <label for="min-words-limit-checkbox" class="col-sm-3">
+						<label for="min-words-limit-checkbox" class="col-sm-3">
 							<input type="checkbox" id="min-words-limit-checkbox" name="noname"
-								<c:if test="${assessmentQuestionForm.minWordsLimit != 0}">checked="checked"</c:if>/>
-					    	<fmt:message key="label.minimum.number.words" />
-					    </label>
-					    
-					    <div class="col-sm-9">
-					    	<form:input path="minWordsLimit" id="min-words-limit"/>
-					    	<label id="min-words-limit-error" class="alert alert-danger" for="min-words-limit" style="display: none;"></label>
-					    </div>
+								   <c:if test="${assessmentQuestionForm.minWordsLimit != 0}">checked="checked"</c:if>/>
+							<fmt:message key="label.minimum.number.words" />
+						</label>
+
+						<div class="col-sm-9">
+							<form:input path="minWordsLimit" id="min-words-limit"/>
+							<label id="min-words-limit-error" class="alert alert-danger" for="min-words-limit" style="display: none;"></label>
+						</div>
 					</div>
-	
+
 					<div class="voffset5 form-group">
 						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
-						<lams:CKEditor id="feedback" value="${assessmentQuestionForm.feedback}" 
-							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+						<lams:CKEditor id="feedback" value="${assessmentQuestionForm.feedback}"
+									   placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
-					
+
 					<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
 				</div>
-					
+
 			</form:form>
 
-		</div>		
-	</div>		
-	
+		</div>
+	</div>
+
 	<%@ include file="addQuestionFooter.jsp"%>
-</body>
-</lams:html>
+	</body>
+</lams:html>
\ No newline at end of file
Index: lams_central/web/qb/authoring/addtruefalse.jsp
===================================================================
diff -u -rc04504bfdd9685850e15792838241a748f13560e -r70a326811aab339193f6031102dfde367b21cc5c
--- lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision c04504bfdd9685850e15792838241a748f13560e)
+++ lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
@@ -1,11 +1,14 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<c:set var="allowCreatingQbCollections"><%=Configuration.get(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW)%></c:set>
 <c:set var="questionType" value="5"	scope="request" />
 <c:set var="isNewQuestion" value="${assessmentQuestionForm.uid eq -1}" />
-		
+
 <lams:html>
 	<lams:head>
-	
+
 		<lams:css />
 		<link href="<lams:LAMSURL/>/tool/laasse10/includes/css/assessment.css" rel="stylesheet" type="text/css">
 		<link href="<lams:LAMSURL/>/css/bootstrap-toggle.css" rel="stylesheet" type="text/css">
@@ -20,63 +23,67 @@
 			const SAVE_QUESTION_URL = "/lams/qb/edit/saveOrUpdateQuestion.do";
 			const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
 			const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
-			
-			var isNewQuestion = ${isNewQuestion};
+			const ADD_COLLECTION_LABEL = '<fmt:message key="label.questions.choice.collection.new.prompt" />';
+			const LAMS_URL = '<lams:LAMSURL/>';
+
+			var isNewQuestion = ${isNewQuestion},
+					csrfTokenName = '<csrf:tokenname/>',
+					csrfTokenValue = '<csrf:tokenvalue/>';
 		</script>
 		<lams:JSImport src="includes/javascript/qb-question.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap-toggle.js"></script>
-  	    <script>
+		<script>
 			$(document).ready(function(){
-		    	$("#assessmentQuestionForm").validate({
-		    		ignore: 'hidden, div.cke_editable',
-		    		rules: {
-		    			title: "required",
-		    			maxMark: {
-		    			      required: true,
-		    			      digits: true
-		    			},
-		    			penaltyFactor: {
-		    			      required: true,
-		    			      number: true
-		    			}
-		    		},
-		    		messages: {
-		    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    			maxMark: {
-		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
-		    			},
-		    			penaltyFactor: {
-		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
-		    			}
-		    		},
-     			    submitHandler: function(form) {
-		    			$("#description").val(CKEDITOR.instances.description.getData());
-		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
-		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
-		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
-		    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
-		    			
-		    	    	var isVersionBeingChecked = isVersionCheck(),
-		    	    		options = { 
-			    	    		target:  isVersionBeingChecked ? null : parent.jQuery('#itemArea'), 
-			    	    		dataType : isVersionBeingChecked? 'json' : null, 
-			    		   		success: isVersionBeingChecked? afterVersionCheck : afterRatingSubmit  // post-submit callback
-			    		    };			
-		    		    				
-		    			$('#assessmentQuestionForm').ajaxSubmit(options);
-		    		},
-		    	    invalidHandler: formValidationInvalidHandler,
+				$("#assessmentQuestionForm").validate({
+					ignore: 'hidden, div.cke_editable',
+					rules: {
+						title: "required",
+						maxMark: {
+							required: true,
+							digits: true
+						},
+						penaltyFactor: {
+							required: true,
+							number: true
+						}
+					},
+					messages: {
+						title: "<fmt:message key='label.authoring.choice.field.required'/>",
+						maxMark: {
+							required: "<fmt:message key='label.authoring.choice.field.required'/>",
+							digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
+						},
+						penaltyFactor: {
+							required: "<fmt:message key='label.authoring.choice.field.required'/>",
+							number: "<fmt:message key='label.authoring.choice.enter.float'/>"
+						}
+					},
+					submitHandler: function(form) {
+						$("#description").val(CKEDITOR.instances.description.getData());
+						$("#feedback").val(CKEDITOR.instances.feedback.getData());
+						$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
+						$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
+						$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
+
+						var isVersionBeingChecked = isVersionCheck(),
+								options = {
+									target:  isVersionBeingChecked ? null : parent.jQuery('#itemArea'),
+									dataType : isVersionBeingChecked? 'json' : null,
+									success: isVersionBeingChecked? afterVersionCheck : afterRatingSubmit  // post-submit callback
+								};
+
+						$('#assessmentQuestionForm').ajaxSubmit(options);
+					},
+					invalidHandler: formValidationInvalidHandler,
 					errorElement: "em",
 					errorPlacement: formValidationErrorPlacement,
 					highlight: formValidationHighlight,
 					unhighlight: formValidationUnhighlight
-		  		});
+				});
 			});
-			
+
 			function saveQuestion(isNewVersion) {
 				let form = $('#assessmentQuestionForm');
 				if (isNewVersion) {
@@ -85,17 +92,17 @@
 				}
 				form.submit();
 			}
-  		</script>
-</lams:head>
-<body>
+		</script>
+	</lams:head>
+	<body>
 	<div class="panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.true.false.question" />
 		</div>
-			
+
 		<div class="panel-body">
 			<form:form action="/lams/qb/edit/saveOrUpdateQuestion.do" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm"
-				method="post" autocomplete="off">
+					   method="post" autocomplete="off">
 				<form:hidden path="authoringRestricted"/>
 				<form:hidden path="sessionMapID" />
 				<form:hidden path="uid" />
@@ -109,94 +116,94 @@
 				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
 					<fmt:message key="label.settings" />
 				</button>
-				
+
 				<div class="question-tab">
 					<lams:errors/>
-					 <div class="error">
-				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+					<div class="error">
+						<lams:Alert id="errorMessages" type="danger" close="false" >
 							<span></span>
-						</lams:Alert>	
-				    </div>
-	
+						</lams:Alert>
+					</div>
+
 					<div id="title-container" class="form-group">
 						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
-					    <form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255"
-					    	placeholder="${TITLE_LABEL}"/>
+						<form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255"
+									placeholder="${TITLE_LABEL}"/>
 					</div>
-				
+
 					<div class="form-group">
 						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
-						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
-							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}"
+									   placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
-					
+
 					<div class="voffset10-bottom form-group">
 						<label for="correctAnswer">
 							<fmt:message key="label.authoring.true.false.correct.answer" />
 						</label>
-						
+
 						<c:set var="TRUE_LABEL"><fmt:message key="label.authoring.true.false.true" /></c:set>
 						<c:set var="FALSE_LABEL"><fmt:message key="label.authoring.true.false.false" /></c:set>
-						<form:checkbox path="correctAnswer" id="correctAnswer" 
-							data-toggle="toggle" data-on="${TRUE_LABEL}" data-off="${FALSE_LABEL}" data-size="mini"/>
+						<form:checkbox path="correctAnswer" id="correctAnswer"
+									   data-toggle="toggle" data-on="${TRUE_LABEL}" data-off="${FALSE_LABEL}" data-size="mini"/>
 					</div>
 				</div>
-				
+
 				<div class="settings-tab">
-					 <div class="error">
-				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+					<div class="error">
+						<lams:Alert id="errorMessages" type="danger" close="false" >
 							<span></span>
-						</lams:Alert>	
-				    </div>
-					
+						</lams:Alert>
+					</div>
+
 					<c:if test="${!assessmentQuestionForm.authoringRestricted}">
 						<div class="form-group row form-inline">
-						    <label for="maxMark" class="col-sm-3">
-						    	<fmt:message key="label.authoring.basic.default.question.grade" />
-						    	<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-						    </label>
-						    
-						    <div class="col-sm-9">
-						    	<form:input path="maxMark" cssClass="form-control short-input-text input-sm"/>
-						    </div>
+							<label for="maxMark" class="col-sm-3">
+								<fmt:message key="label.authoring.basic.default.question.grade" />
+								<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+							</label>
+
+							<div class="col-sm-9">
+								<form:input path="maxMark" cssClass="form-control short-input-text input-sm"/>
+							</div>
 						</div>
 					</c:if>
-					
+
 					<div class="form-group row form-inline">
-					    <label for="penaltyFactor" class="col-sm-3"> 
-					    	<fmt:message key="label.authoring.basic.penalty.factor" />
-							  <i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-					    </label>
-					    
-					    <div class="col-sm-9">
-					    	<form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
-					    </div>
+						<label for="penaltyFactor" class="col-sm-3">
+							<fmt:message key="label.authoring.basic.penalty.factor" />
+							<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						</label>
+
+						<div class="col-sm-9">
+							<form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+						</div>
 					</div>
-									
+
 					<div class="voffset5 form-group">
 						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
-						<lams:CKEditor id="feedback" value="${assessmentQuestionForm.feedback}" 
-							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+						<lams:CKEditor id="feedback" value="${assessmentQuestionForm.feedback}"
+									   placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
-					
+
 					<div class="form-group">
-				    	<c:set var="FEEDBACK_ON_TRUE_LABEL"><fmt:message key="label.authoring.true.false.feedback.on.true"/></c:set>
-						<lams:CKEditor id="feedbackOnCorrect" value="${assessmentQuestionForm.feedbackOnCorrect}" 
-							placeholder="${FEEDBACK_ON_TRUE_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+						<c:set var="FEEDBACK_ON_TRUE_LABEL"><fmt:message key="label.authoring.true.false.feedback.on.true"/></c:set>
+						<lams:CKEditor id="feedbackOnCorrect" value="${assessmentQuestionForm.feedbackOnCorrect}"
+									   placeholder="${FEEDBACK_ON_TRUE_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
-						
+
 					<div class="form-group">
-				        <c:set var="FEEDBACK_ON_FALSE_LABEL"><fmt:message key="label.authoring.true.false.feedback.on.false"/></c:set>
-						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
-							placeholder="${FEEDBACK_ON_FALSE_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+						<c:set var="FEEDBACK_ON_FALSE_LABEL"><fmt:message key="label.authoring.true.false.feedback.on.false"/></c:set>
+						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}"
+									   placeholder="${FEEDBACK_ON_FALSE_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
-					
+
 					<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
 				</div>
 			</form:form>
-		</div>	
+		</div>
 	</div>
-	
+
 	<%@ include file="addQuestionFooter.jsp"%>
-</body>
-</lams:html>
+	</body>
+</lams:html>
\ No newline at end of file
Index: lams_central/web/questions/questionChoice.jsp
===================================================================
diff -u -r3bc02e2e2858938ef1fce59766cb6e682de8107d -r70a326811aab339193f6031102dfde367b21cc5c
--- lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 3bc02e2e2858938ef1fce59766cb6e682de8107d)
+++ lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
@@ -184,9 +184,6 @@
 						previouslySelectedOption.removeAttr('selected');
 						$('option[value="' + newValue + '"]', collectionSelect).attr('selected', 'selected');
 					}
-
-
-
 				});
 			});
 		</script>
@@ -218,7 +215,6 @@
 					<input type="hidden" name="questionCount" value="${fn:length(questions)}" />
 
 					<c:if test="${not empty collections}">
-						<fmt:message key="label.questions.choice.collection.new.option" var="newOptionLabel"/>
 						<!-- Choose a collection where questions should be imported to -->
 						<label id="collectionSelect">
 							<fmt:message key="label.questions.choice.collection" />&nbsp;
@@ -229,6 +225,7 @@
 									</option>
 								</c:forEach>
 								<c:if test="${allowCreatingQbCollections}">
+									<fmt:message key="label.questions.choice.collection.new.option" var="newOptionLabel"/>
 									<option value="-1"><c:out escapeXml="true" value="${newOptionLabel}" /></option>
 								</c:if>
 							</select>
Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rdecee05de5d7a90fe2aef3af04f588494262685b -r70a326811aab339193f6031102dfde367b21cc5c
--- lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision decee05de5d7a90fe2aef3af04f588494262685b)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
@@ -230,3 +230,5 @@
 label.answer.required = Require answer?
 label.prevent.learner.autosave.mutliple.tabs = You seem to have two LAMS tabs open for this exam. Please close one of them. Otherwise, answers will not be recorder properly and affect your score.
 label.no.added.questions = No questions have been added. Please add at least one question.
+label.questions.choice.collection.new.option = <Add new collection>
+label.questions.choice.collection.new.prompt = Enter a name for the new collection:
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java
===================================================================
diff -u -rc34b16da7fe48d6ed5ad039f0a61f66a12b215a0 -r70a326811aab339193f6031102dfde367b21cc5c
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision c34b16da7fe48d6ed5ad039f0a61f66a12b215a0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
@@ -23,24 +23,8 @@
 
 package org.lamsfoundation.lams.tool.qa.web.controller;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.UUID;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
@@ -69,14 +53,16 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.sql.Timestamp;
+import java.util.*;
 
 /**
  * Q&A Tool's authoring methods. Additionally, there is one more method that initializes authoring and it's located in
@@ -483,6 +469,7 @@
 	form.setContentFolderID(questionContentFolderID);
 	form.setQuestionId(qbService.generateNextQuestionId()); // generate a new question ID right away, so another user won't "take it"
 
+	request.setAttribute("isNewQuestion", true);
 	QbUtils.fillFormWithUserCollections(qbService, form, null);
 	return "authoring/newQuestionBox";
     }
@@ -515,7 +502,7 @@
 	form.setContentFolderID(qbQuestion.getContentFolderId());
 	form.setSessionMapID(sessionMapID);
 	QbUtils.fillFormWithUserCollections(qbService, QaAppConstants.MY_SIGNATURE, form, qbQuestion.getUid());
-
+	request.setAttribute("isNewQuestion", false);
 	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
 	return "authoring/newQuestionBox";
     }
@@ -673,4 +660,4 @@
 	request.setAttribute(QaAppConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
     }
-}
+}
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r7ca2115adff4164bb6f5b3b878c68a205cc98634 -r70a326811aab339193f6031102dfde367b21cc5c
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 7ca2115adff4164bb6f5b3b878c68a205cc98634)
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
@@ -1,5 +1,8 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<c:set var="allowCreatingQbCollections"><%=Configuration.get(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW)%></c:set>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:set var="isAuthoringRestricted" value="${sessionMap.mode == 'teacher'}" />
@@ -11,21 +14,27 @@
 		<link href="<lams:LAMSURL/>css/qb-question.css" rel="stylesheet" type="text/css">
 		<style>
 			label.error {
-			    float: none;
-			    color: #d9534f;
-			    vertical-align: top;
-			    font-weight: bold;
-			    font-style: italic;
+				float: none;
+				color: #d9534f;
+				vertical-align: top;
+				font-weight: bold;
+				font-style: italic;
 			}
 		</style>
-	
+
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
 		<script type="text/javascript">
 			const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
 			const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
+			const ADD_COLLECTION_LABEL = '<fmt:message key="label.questions.choice.collection.new.prompt" />';
+			const LAMS_URL = '<lams:LAMSURL/>';
+
+			let isNewQuestion = ${isNewQuestion},
+					csrfTokenName = '<csrf:tokenname/>',
+					csrfTokenValue = '<csrf:tokenvalue/>';
 		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/qb-question.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
@@ -39,83 +48,83 @@
 					form.attr('action', action + '&newVersion=true');
 				}
 				form.submit();
-		  	}
-		
+			}
+
 			$(document).ready(function(){
-				
-		    	$("#newQuestionForm").validate({
-		    		ignore : 'div.cke_editable',
-		    		rules: {
-		    			title: "required",
-			    		minWordsLimit: {
-			    		    digits: true
-			    		}
-		    		},
-		    		messages: {
-		    			title: "<fmt:message key='label.title.required'/>"
-		    		},
-		    	    invalidHandler: function(form, validator) {
-		    		      var errors = validator.numberOfInvalids();
-		    		      if (errors) {
-		    		          var message = errors == 1
-		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
-		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
-	    		          	  
-		    		          $("div.error span").html(message);
-		    		          $("div.error").show();
-		    		      } else {
-		    		          $("div.error").hide();
-		    		      }
-		    		},
-		    		debug: false,
-     			    submitHandler: function(form) {
-		    			$("#description").val(CKEDITOR.instances.description.getData());
-		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
-		    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
-		    			
-		    	    	var items = { 
-		    	    		target:  parent.jQuery('#itemArea'), 
-		    		   		success: function (responseText, statusText)  { 
-		    	    			self.parent.refreshThickbox()
-		    	    			self.parent.tb_remove();
-		    	    		} 
-		    		    };
-		    		    				
-		    			$('#newQuestionForm').ajaxSubmit(items);
-		    		},
-		    		invalidHandler: formValidationInvalidHandler,
+
+				$("#newQuestionForm").validate({
+					ignore : 'div.cke_editable',
+					rules: {
+						title: "required",
+						minWordsLimit: {
+							digits: true
+						}
+					},
+					messages: {
+						title: "<fmt:message key='label.title.required'/>"
+					},
+					invalidHandler: function(form, validator) {
+						var errors = validator.numberOfInvalids();
+						if (errors) {
+							var message = errors == 1
+									? "<fmt:message key='error.form.validation.error'/>"
+									: "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
+
+							$("div.error span").html(message);
+							$("div.error").show();
+						} else {
+							$("div.error").hide();
+						}
+					},
+					debug: false,
+					submitHandler: function(form) {
+						$("#description").val(CKEDITOR.instances.description.getData());
+						$("#feedback").val(CKEDITOR.instances.feedback.getData());
+						$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
+
+						var items = {
+							target:  parent.jQuery('#itemArea'),
+							success: function (responseText, statusText)  {
+								self.parent.refreshThickbox()
+								self.parent.tb_remove();
+							}
+						};
+
+						$('#newQuestionForm').ajaxSubmit(items);
+					},
+					invalidHandler: formValidationInvalidHandler,
 					errorElement: "em",
 					errorPlacement: formValidationErrorPlacement,
 					highlight: formValidationHighlight,
 					unhighlight: formValidationUnhighlight
-		  		});
+				});
 
-			   	//spinner
-		    	var minimumWordsSpinner = $( "#min-words-limit" ).spinner({ 
+				//spinner
+				var minimumWordsSpinner = $( "#min-words-limit" ).spinner({
 					min: 0,
 					disabled: ($( "#min-words-limit" ).val() == 0)
-			    });
-			    	
-			    //spinner
-		    	$("#min-words-limit-checkbox").click(function() {
-		    		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
-		    			minimumWordsSpinner.spinner( "enable" );
-		    		} else {
-		    			minimumWordsSpinner.spinner( "disable" );
-		    		}
-		        });
-			});   
-  		</script>
+				});
+
+				//spinner
+				$("#min-words-limit-checkbox").click(function() {
+					if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+						minimumWordsSpinner.spinner( "enable" );
+					} else {
+						minimumWordsSpinner.spinner( "disable" );
+					}
+				});
+			});
+		</script>
 	</lams:head>
 	<body>
-		<div class="panel-default add-file">
-			<div class="panel-heading">
-				<div class="panel-title panel-learner-title">
-					<fmt:message key="label.add.new.question" />
-				</div>
+	<div class="panel-default add-file">
+		<div class="panel-heading">
+			<div class="panel-title panel-learner-title">
+				<fmt:message key="label.add.new.question" />
 			</div>
-			
-			<div class="panel-body panel-${type}-body">
+		</div>
+
+		<div class="panel-body panel-${type}-body">
 			<c:set var="csrfToken"><csrf:token/></c:set>
 			<form:form action="/lams/tool/laqa11/authoring/saveQuestion.do?${csrfToken}" method="post" modelAttribute="newQuestionForm" id="newQuestionForm">
 				<form:hidden path="sessionMapID" />
@@ -124,96 +133,100 @@
 				<form:hidden path="questionId" />
 				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
 				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
-			
+
 				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
 					<fmt:message key="label.settings" />
 				</button>
-				
+
 				<div class="question-tab">
 					<lams:errors/>
-	
+
 					<div id="title-container" class="form-group">
 						<c:set var="TITLE_LABEL"><fmt:message key="label.title"/> </c:set>
-						<form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255" 
-						    	placeholder="${TITLE_LABEL}"/>
+						<form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255"
+									placeholder="${TITLE_LABEL}"/>
 					</div>
-	
+
 					<div class="form-group form-group-cke">
 						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.question"/></c:set>
-						<lams:CKEditor id="description" value="${newQuestionForm.description}" contentFolderID="${newQuestionForm.contentFolderID}" 
-							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+						<lams:CKEditor id="description" value="${newQuestionForm.description}" contentFolderID="${newQuestionForm.contentFolderID}"
+									   placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
 				</div>
-				
+
 				<div class="settings-tab">
 					<div class="form-group row form-inline" style="display: flex; align-items: center;">
-					    <label for="min-words-limit-checkbox" class="col-sm-4">
+						<label for="min-words-limit-checkbox" class="col-sm-4">
 							<input type="checkbox" id="min-words-limit-checkbox" name="noname"
-								<c:if test="${newQuestionForm.minWordsLimit != 0}">checked="checked"</c:if>/>
-					    	<fmt:message key="label.minimum.number.words" >
+								   <c:if test="${newQuestionForm.minWordsLimit != 0}">checked="checked"</c:if>/>
+							<fmt:message key="label.minimum.number.words" >
 								<fmt:param> </fmt:param>
 							</fmt:message>
-					    </label>
-						    
-					    <div class="col-sm-8">
-					    	<form:input path="minWordsLimit" id="min-words-limit"/>
-					    	<label id="min-words-limit-error" class="alert alert-danger" for="min-words-limit" style="display: none;"></label>
-					    </div>
+						</label>
+
+						<div class="col-sm-8">
+							<form:input path="minWordsLimit" id="min-words-limit"/>
+							<label id="min-words-limit-error" class="alert alert-danger" for="min-words-limit" style="display: none;"></label>
+						</div>
 					</div>
-						
+
 					<div class="form-group">
 						<c:set var="FEEDBACK_LABEL"><fmt:message key="label.feedback"/></c:set>
-						<lams:CKEditor id="feedback" value="${newQuestionForm.feedback}" 
-							placeholder="${FEEDBACK_LABEL}" contentFolderID="${newQuestionForm.contentFolderID}" />
+						<lams:CKEditor id="feedback" value="${newQuestionForm.feedback}"
+									   placeholder="${FEEDBACK_LABEL}" contentFolderID="${newQuestionForm.contentFolderID}" />
 					</div>
-					
+
 					<lams:OutcomeAuthor qbQuestionId="${newQuestionForm.questionId}"  />
 				</div>
 			</form:form>
-			</div>
 		</div>
-			
-		<footer class="footer fixed-bottom">
-			<div class="panel-heading ">
-		       	<div class="col-xs-12x col-md-6x form-groupx rowx form-inlinex btn-group-md voffset5">
+	</div>
+
+	<footer class="footer fixed-bottom">
+		<div class="panel-heading ">
+			<div class="col-xs-12x col-md-6x form-groupx rowx form-inlinex btn-group-md voffset5">
 					<%-- Hide if the question is not in users' collections  --%>
-       				<span <c:if test="${empty newQuestionForm.userCollections}">style="visibility: hidden;"</c:if>>
+				<span <c:if test="${empty newQuestionForm.userCollections}">style="visibility: hidden;"</c:if>>
 			       		Collection
 			        		
 						<select class="btn btn-md btn-default" id="collection-uid-select">
 							<c:forEach var="collection" items="${newQuestionForm.userCollections}">
 								<option value="${collection.uid}"
-									<c:if test="${collection.uid == newQuestionForm.oldCollectionUid}">selected="selected"</c:if>>
+										<c:if test="${collection.uid == newQuestionForm.oldCollectionUid}">selected="selected"</c:if>>
 									<c:out value="${collection.name}" />
 								</option>
 							</c:forEach>
+							<c:if test="${allowCreatingQbCollections}">
+								<fmt:message key="label.questions.choice.collection.new.option" var="newOptionLabel"/>
+								<option value="-1"><c:out escapeXml="true" value="${newOptionLabel}" /></option>
+							</c:if>
 						</select>
 					</span>
-						
-		        	<div class="pull-right col-xs-12x col-md-6x" style="margin-top: -5px;">
-					    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
-							<fmt:message key="label.cancel" />
+
+				<div class="pull-right col-xs-12x col-md-6x" style="margin-top: -5px;">
+					<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+						<fmt:message key="label.cancel" />
+					</a>
+
+					<div class="btn-group btn-group-sm dropup">
+						<a id="saveButton" type="button" class="btn btn-sm btn-default button-add-item" onClick="javascript:saveQuestion(false)">
+							<fmt:message key="label.save.question" />
 						</a>
-						
-						<div class="btn-group btn-group-sm dropup">
-							<a id="saveButton" type="button" class="btn btn-sm btn-default button-add-item" onClick="javascript:saveQuestion(false)">
-								<fmt:message key="label.save.question" />
-							</a>
-							<button id="saveDropButton" type="button" class="btn btn-default dropdown-toggle"
-									data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-								<span class="caret"></span>
-								<span class="sr-only">Toggle Dropdown</span>
-							</button>
-							<ul class="dropdown-menu">
-								<li id="saveAsButton" onClick="javascript:saveQuestion(true)"><a href="#">
-									<fmt:message key="label.save.question.new.version" />
-								</a></li>
-							</ul>
-						</div>
+						<button id="saveDropButton" type="button" class="btn btn-default dropdown-toggle"
+								data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+							<span class="caret"></span>
+							<span class="sr-only">Toggle Dropdown</span>
+						</button>
+						<ul class="dropdown-menu">
+							<li id="saveAsButton" onClick="javascript:saveQuestion(true)"><a href="#">
+								<fmt:message key="label.save.question.new.version" />
+							</a></li>
+						</ul>
 					</div>
 				</div>
-		   	</div>
-		</footer>
-					
+			</div>
+		</div>
+	</footer>
+
 	</body>
-</lams:html>
+</lams:html>
\ No newline at end of file
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2265c2e9ad0c8a27f390fcfc67769877b8c651d9 -r70a326811aab339193f6031102dfde367b21cc5c
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2265c2e9ad0c8a27f390fcfc67769877b8c651d9)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
@@ -300,3 +300,5 @@
 label.vsa.allocate.button = Allocate VSAs
 label.prevent.learner.autosave.mutliple.tabs = You seem to have two LAMS tabs open for this exam. Please close one of them. Otherwise, answers will not be recorder properly and affect your score.
 label.exact.match = Learner answer must exactly match expected answer
+label.questions.choice.collection.new.option = <Add new collection>
+label.questions.choice.collection.new.prompt = Enter a name for the new collection:
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/authoring/parts/addItemFooter.jsp
===================================================================
diff -u -r6ec82271ed6bf6f295a9006d88e58996ca7de2dd -r70a326811aab339193f6031102dfde367b21cc5c
--- lams_tool_scratchie/web/pages/authoring/parts/addItemFooter.jsp	(.../addItemFooter.jsp)	(revision 6ec82271ed6bf6f295a9006d88e58996ca7de2dd)
+++ lams_tool_scratchie/web/pages/authoring/parts/addItemFooter.jsp	(.../addItemFooter.jsp)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
@@ -1,4 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<c:set var="allowCreatingQbCollections"><%=Configuration.get(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW)%></c:set>
 
 <script>
 	function saveItem(isNewVersion){
@@ -8,31 +11,80 @@
 			form.attr('action', action + '?newVersion=true');
 		}
 		form.submit();
-  	}
+	}
+
+	$(document).ready(function (){
+		$('#collection-uid-select').change(function(){
+			let collectionSelect = $(this),
+					newValue = collectionSelect.val(),
+					previouslySelectedOption = $('option[selected]', collectionSelect);
+			if (newValue == -1) {
+				// create a new collection on the fly
+				let newCollectionName = prompt('<fmt:message key="label.questions.choice.collection.new.prompt" />'),
+						newCollectionUid = -1;
+				if (newCollectionName) {
+					newCollectionName = newCollectionName.trim();
+					$.ajax({
+						'url' : '<lams:LAMSURL/>qb/collection/addCollection.do',
+						'async' : false,
+						'type' : 'post',
+						'dataType' : 'text',
+						'data' : {
+							'name' : newCollectionName,
+							'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
+						},
+						success : function (response){
+							if (!isNaN(response)) {
+								newCollectionUid = +response;
+							}
+						},
+						error : function (xhr) {
+							alert(xhr.responseText);
+						}
+					});
+				}
+
+				if (newCollectionUid == -1 || newCollectionUid == 0) {
+					// revert to previous selection
+					previouslySelectedOption.prop('selected', true);
+				} else {
+					$('<option>').attr('value', newCollectionUid).attr('selected', 'selected')
+							.prop('selected', true).text(newCollectionName).insertBefore($('option[value="-1"]', collectionSelect));
+				}
+			} else {
+				previouslySelectedOption.removeAttr('selected');
+				$('option[value="' + newValue + '"]', collectionSelect).attr('selected', 'selected');
+			}
+		});
+	});
 </script>
 
 <footer class="footer fixed-bottom">
 	<div class="panel-heading ">
-       	<div class="col-xs-12x col-md-6x form-groupx rowx form-inlinex btn-group-md voffset5">
-       		<%-- Hide if the question is not in users' collections  --%>
-       		<span <c:if test="${empty scratchieItemForm.userCollections}">style="visibility: hidden;"</c:if>>
+		<div class="col-xs-12x col-md-6x form-groupx rowx form-inlinex btn-group-md voffset5">
+			<%-- Hide if the question is not in users' collections  --%>
+			<span <c:if test="${empty scratchieItemForm.userCollections}">style="visibility: hidden;"</c:if>>
 	       		Collection
 	        		
 				<select class="btn btn-md btn-default" id="collection-uid-select">
 					<c:forEach var="collection" items="${scratchieItemForm.userCollections}">
 						<option value="${collection.uid}"
-							<c:if test="${collection.uid == scratchieItemForm.oldCollectionUid}">selected="selected"</c:if>>
+								<c:if test="${collection.uid == scratchieItemForm.oldCollectionUid}">selected="selected"</c:if>>
 							<c:out value="${collection.name}" />
 						</option>
 					</c:forEach>
+					<c:if test="${allowCreatingQbCollections}">
+						<fmt:message key="label.questions.choice.collection.new.option" var="newOptionLabel"/>
+						<option value="-1"><c:out escapeXml="true" value="${newOptionLabel}" /></option>
+					</c:if>
 				</select>
 			</span>
-				
-        	<div class="pull-right col-xs-12x col-md-6x" style="margin-top: -5px;">
-			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+
+			<div class="pull-right col-xs-12x col-md-6x" style="margin-top: -5px;">
+				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.authoring.cancel.button" />
 				</a>
-				
+
 				<div class="btn-group btn-group-sm dropup">
 					<a id="saveButton" type="button" class="btn btn-sm btn-default button-add-item" onClick="javascript:saveItem(false)">
 						<fmt:message key="label.authoring.save.button" />
@@ -50,5 +102,5 @@
 				</div>
 			</div>
 		</div>
-   	</div>
+	</div>
 </footer>
\ No newline at end of file