Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -raec96466d0f510ff3a0acfc5651f485bb1b477d9 -rca75b4c508f9d195245818cdd4574f335e75d9c6
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision aec96466d0f510ff3a0acfc5651f485bb1b477d9)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ca75b4c508f9d195245818cdd4574f335e75d9c6)
@@ -641,6 +641,7 @@
 config.qb.qti.enable =Enable QTI question import/export
 config.qb.word.enable =Enable Word question import
 config.qb.collections.create.enable =Allow creating custom collections
+config.qb.collections.transfer.enable =Allow question transfer between collections
 config.qb.monitors.read.only =Force read-only access for monitors
 config.qb.stats.min.participants =Minimum test participant number to calculate question indexes
 config.qb.stats.group.size =Percent of participants in top/bottom performers group (default: 27)
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
===================================================================
diff -u -rfe0a5324254ef622171304b5a01341d99e7b991a -rca75b4c508f9d195245818cdd4574f335e75d9c6
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java	(.../QbCollectionController.java)	(revision fe0a5324254ef622171304b5a01341d99e7b991a)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java	(.../QbCollectionController.java)	(revision ca75b4c508f9d195245818cdd4574f335e75d9c6)
@@ -37,6 +37,8 @@
 import org.lamsfoundation.lams.qb.service.IQbService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.CommonConstants;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -74,6 +76,9 @@
 		Collectors.toMap(QbCollection::getUid, c -> qbService.getCountCollectionQuestions(c.getUid(), null)));
 	model.addAttribute("questionCount", questionCount);
 
+	model.addAttribute("createCollectionAllowed",
+		Configuration.getAsBoolean(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW));
+
 	return "qb/collectionList";
     }
 
@@ -169,12 +174,18 @@
     @ResponseBody
     public void addCollectionQuestion(@RequestParam long targetCollectionUid, @RequestParam boolean copy,
 	    @RequestParam long qbQuestionUid) {
+	if (!Configuration.getAsBoolean(ConfigurationKeys.QB_COLLECTIONS_TRANSFER_ALLOW)) {
+	    throw new SecurityException("Transfering questions between collections is disabled");
+	}
 	qbService.addQuestionToCollection(targetCollectionUid, qbQuestionUid, copy);
     }
 
     @RequestMapping("/addCollection")
     @ResponseBody
     public void addCollection(@RequestParam String name) {
+	if (!Configuration.getAsBoolean(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW)) {
+	    throw new SecurityException("New collections are disabled");
+	}
 	qbService.addCollection(getUserId(), name);
     }
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
===================================================================
diff -u -r0952bdcd231fe03cb52b8d821bc6cc1882b7c369 -rca75b4c508f9d195245818cdd4574f335e75d9c6
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java	(.../QbStatsController.java)	(revision 0952bdcd231fe03cb52b8d821bc6cc1882b7c369)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java	(.../QbStatsController.java)	(revision ca75b4c508f9d195245818cdd4574f335e75d9c6)
@@ -31,6 +31,8 @@
 import org.lamsfoundation.lams.qb.model.QbCollection;
 import org.lamsfoundation.lams.qb.service.IQbService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -71,6 +73,9 @@
 	model.addAttribute("permanentRemovePossible",
 		permanentRemove ? qbService.removeQuestionPossible(qbQuestionUid) : false);
 
+	model.addAttribute("transferAllowed",
+		Configuration.getAsBoolean(ConfigurationKeys.QB_COLLECTIONS_TRANSFER_ALLOW));
+
 	return "qb/stats";
     }
 
Index: lams_central/web/qb/collection.jsp
===================================================================
diff -u -rba4cb0681d080596444ca44c644a8ea0fdd8e743 -rca75b4c508f9d195245818cdd4574f335e75d9c6
--- lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision ba4cb0681d080596444ca44c644a8ea0fdd8e743)
+++ lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision ca75b4c508f9d195245818cdd4574f335e75d9c6)
@@ -13,6 +13,10 @@
 	<lams:css/>
 	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
 	<style>
+		#edit-collection-button {
+			float: right;
+		}
+		
 		.row {
 			margin-top: 10px;
 		}
@@ -154,11 +158,39 @@
 				document.location.reload();
 			});
 		}
+		
+		// add a new collection
+		function changeCollectionName() {
+			var name = prompt("New collection name");
+			if (name) {
+				$.ajax({
+					'url'  : '<lams:LAMSURL />qb/collection/changeCollectionName.do',
+					'type' : 'POST',
+					'dataType' : 'text',
+					'data' : {
+						'collectionUid' : ${collection.uid},
+						'name' : name
+					},
+					'cache' : false
+				}).done(function(created){
+					if (created == 'true') {
+						document.location.reload();
+					} else {
+						alert('Collection with such name already exists');
+					}
+				});
+			}
+		}
 	</script>
 </lams:head>
 <body class="stripes">
 <lams:Page title="Collection" type="admin">
-	<button class="btn btn-default" onClick="javascript:document.location.href='<lams:LAMSURL />qb/collection/show.do'">Collection management</button>
+	<div>
+		<button class="btn btn-default" onClick="javascript:document.location.href='<lams:LAMSURL />qb/collection/show.do'">
+			Collection management
+		</button>
+		<button id="edit-collection-button" class="btn btn-primary" onClick="javascript:changeCollectionName()">Change name</button>
+	</div>
 	<div class="panel-body">
 		<c:choose>
 			<c:when test="${hasQuestions}">
Index: lams_central/web/qb/collectionList.jsp
===================================================================
diff -u -rba4cb0681d080596444ca44c644a8ea0fdd8e743 -rca75b4c508f9d195245818cdd4574f335e75d9c6
--- lams_central/web/qb/collectionList.jsp	(.../collectionList.jsp)	(revision ba4cb0681d080596444ca44c644a8ea0fdd8e743)
+++ lams_central/web/qb/collectionList.jsp	(.../collectionList.jsp)	(revision ca75b4c508f9d195245818cdd4574f335e75d9c6)
@@ -130,9 +130,12 @@
 </lams:head>
 <body class="stripes">
 <lams:Page title="Collection management" type="admin">
-	<div id="add-collection-div">
-		<button id="add-collection-button" class="btn btn-primary" onClick="javascript:addCollection()">Add collection</button>
-	</div>
+	<c:if test="${createCollectionAllowed}">
+		<div id="add-collection-div">
+			<button id="add-collection-button" class="btn btn-primary" onClick="javascript:addCollection()">Add collection</button>
+		</div>
+	</c:if>
+	
 	<c:forEach var="collection" items="${collections}">
 		<div class="panel-body">
 			<c:set var="collectionTitle">
Index: lams_central/web/qb/stats.jsp
===================================================================
diff -u -r0952bdcd231fe03cb52b8d821bc6cc1882b7c369 -rca75b4c508f9d195245818cdd4574f335e75d9c6
--- lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision 0952bdcd231fe03cb52b8d821bc6cc1882b7c369)
+++ lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision ca75b4c508f9d195245818cdd4574f335e75d9c6)
@@ -146,7 +146,7 @@
 				</div>
 			</div>
 			
-			<c:if test="${not empty availableCollections}">
+			<c:if test="${not empty availableCollections and transferAllowed}">
 				<div>
 					<span>Transfer questions to </span>
 					<select class="form-control" id="targetCollectionSelect">
@@ -165,7 +165,9 @@
 				<span>Existing collections</span><br />
 				<c:forEach var="collection" items="${existingCollections}">
 					<c:out value="${collection.name}" />
-					<button class="btn btn-default" onClick="javascript:removeCollectionQuestion(${collection.uid})">Remove</button><br />
+					<c:if test="${transferAllowed}">
+						<button class="btn btn-default" onClick="javascript:removeCollectionQuestion(${collection.uid})">Remove</button><br />
+					</c:if>
 				</c:forEach>
 			</div>
 				
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190531.sql
===================================================================
diff -u -re08a9e538cf4c89f50fd15cdabfa0319076c2692 -rca75b4c508f9d195245818cdd4574f335e75d9c6
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190531.sql	(.../patch20190531.sql)	(revision e08a9e538cf4c89f50fd15cdabfa0319076c2692)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190531.sql	(.../patch20190531.sql)	(revision ca75b4c508f9d195245818cdd4574f335e75d9c6)
@@ -34,6 +34,9 @@
 
 INSERT INTO lams_qb_collection_question
 	SELECT 1, uid FROM lams_qb_question;
+	
+INSERT INTO lams_configuration VALUES
+('QbCollectionsTransferEnable', 'true', 'config.qb.collections.transfer.enable', 'config.header.qb', 'BOOLEAN', 1);
 									  		  
 ----------------------Put all sql statements above here-------------------------
 
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -raec96466d0f510ff3a0acfc5651f485bb1b477d9 -rca75b4c508f9d195245818cdd4574f335e75d9c6
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision aec96466d0f510ff3a0acfc5651f485bb1b477d9)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision ca75b4c508f9d195245818cdd4574f335e75d9c6)
@@ -295,6 +295,7 @@
     public static String QB_QTI_ENABLE = "QbQtiEnable";
     public static String QB_WORD_ENABLE = "QbWordEnable";
     public static String QB_COLLECTIONS_CREATE_ALLOW = "QbCollectionsCreateEnable";
+    public static String QB_COLLECTIONS_TRANSFER_ALLOW = "QbCollectionsTransferEnable";
     public static String QB_MONITORS_READ_ONLY = "QbMonitorsReadOnly";
     public static String QB_STATS_MIN_PARTICIPANTS = "QbStatsMinParticipants";
     public static String QB_STATS_GROUP_SIZE = "QbStatsGroupSize";