Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java,v
diff -u -r1.25 -r1.26
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	20 Mar 2013 13:44:02 -0000	1.25
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	4 Jun 2013 13:49:18 -0000	1.26
@@ -1008,11 +1008,11 @@
 
 	int questionIdx = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.PARAM_QUESTION_INDEX), -1);
 	if (questionIdx != -1) {
-	    SortedSet<AssessmentQuestion> assessmentList = getQuestionList(sessionMap);
-	    List<AssessmentQuestion> rList = new ArrayList<AssessmentQuestion>(assessmentList);
+	    SortedSet<AssessmentQuestion> questionList = getQuestionList(sessionMap);
+	    List<AssessmentQuestion> rList = new ArrayList<AssessmentQuestion>(questionList);
 	    AssessmentQuestion question = rList.remove(questionIdx);
-	    assessmentList.clear();
-	    assessmentList.addAll(rList);
+	    questionList.clear();
+	    questionList.addAll(rList);
 	    // add to delList
 	    List delList = getDeletedQuestionList(sessionMap);
 	    delList.add(question);
@@ -1026,11 +1026,18 @@
 		    questionReferenceToDelete = questionReference;
 		}
 	    }
+	    //check if we need to delete random question reference
+	    if ((questionReferenceToDelete == null) && (questionReferences.size() > questionList.size())) {
+		//find the first random question
+		for (QuestionReference questionReference : questionReferences) {
+		    if (questionReference.isRandomQuestion()) {
+			questionReferenceToDelete = questionReference;
+			break;
+		    }
+		}
+	    }
 	    if (questionReferenceToDelete != null) {
-		List<QuestionReference> rRefList = new ArrayList<QuestionReference>(questionReferences);
-		rRefList.remove(questionReferenceToDelete.getSequenceId() - 1);
-		questionReferences.clear();
-		questionReferences.addAll(rRefList);
+		questionReferences.remove(questionReferenceToDelete);
 		// add to delList
 		List<QuestionReference> delReferencesList = getDeletedQuestionReferences(sessionMap);
 		delReferencesList.add(questionReferenceToDelete);
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	3 Oct 2011 13:51:48 -0000	1.5
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	4 Jun 2013 13:49:18 -0000	1.6
@@ -104,7 +104,7 @@
 	
 	
 	<!-- Dropdown menu for choosing a question from question bank -->
-	<c:if test="${not empty availableQuestions}">
+	<c:if test="${fn:length(sessionMap.questionReferences) < fn:length(sessionMap.questionList)}">
 		<p>
 			<select id="questionSelect" style="float: left">
 				<c:if test="${fn:length(availableQuestions) > 1}">