Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
diff -u -r61a2088821a0175b973f9d8354f7432f5fcdc566 -r8d0b1de3acd411878ccc28b222e49c4fe4641aa7
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision 61a2088821a0175b973f9d8354f7432f5fcdc566)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision 8d0b1de3acd411878ccc28b222e49c4fe4641aa7)
@@ -484,7 +484,7 @@
     	
     	if (intTotalQuestionCount-1 == intCurrentQuestionIndex)
     	{
-    		logger.debug("totalQuestionCount has been reached :" + totalQuestionCount);
+    			logger.debug("totalQuestionCount has been reached :" + totalQuestionCount);
         		request.getSession().setAttribute(TOTAL_COUNT_REACHED, new Boolean(true).toString());
         	}
     		
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
diff -u -r94789b14d5f0b1d8bf8e680bb6ef66742e5a27ec -r8d0b1de3acd411878ccc28b222e49c4fe4641aa7
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision 94789b14d5f0b1d8bf8e680bb6ef66742e5a27ec)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision 8d0b1de3acd411878ccc28b222e49c4fe4641aa7)
@@ -202,7 +202,7 @@
 	     */
 	    McUtils.persistTimeZone(request);
 	    ActionForward validateParameters=validateParameters(request, mapping);
-	    logger.debug("validateParamaters: " + validateParameters);
+	    logger.debug("validateParameters: " + validateParameters);
 	    if (validateParameters != null)
 	    {
 	    	return validateParameters;
@@ -608,19 +608,6 @@
 	    request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_CORRECT, mapLeanerFeedbackCorrect);
 	    logger.debug("MAP_LEARNER_FEEDBACK_CORRECT: " + mapLeanerFeedbackCorrect);
 
-	    
-	    
-	    /*
-    	Map mapIncorrectFeedback = AuthoringUtil.rebuildIncorrectFeedbackMapfromDB(request, mcContent.getMcContentId());
-    	logger.debug("existing mapIncorrectFeedback:" + mapIncorrectFeedback);
-    	request.getSession().setAttribute(MAP_INCORRECT_FEEDBACK_LEARNER, mapIncorrectFeedback);
-    	
-    	Map mapCorrectFeedback = AuthoringUtil.rebuildCorrectFeedbackMapfromDB(request, mcContent.getMcContentId());
-    	logger.debug("existing mapCorrectFeedback:" + mapCorrectFeedback);
-    	request.getSession().setAttribute(MAP_CORRECT_FEEDBACK_LEARNER, mapCorrectFeedback);
-    	*/
-	    
-	    
 	    Map mapQuestionWeights=LearningUtil.buildWeightsMap(request, mcContent.getMcContentId());
 	    request.getSession().setAttribute(MAP_QUESTION_WEIGHTS, mapQuestionWeights);
 	    logger.debug("MAP_QUESTION_WEIGHTS: " + mapQuestionWeights);
@@ -641,7 +628,7 @@
 	    if (ss != null)
 	    {
 		    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		    if ((user != null) || (user.getUserID() != null))
+		    if ((user != null) && (user.getUserID() != null))
 		    {
 		    	userID = user.getUserID().toString();
 			    logger.debug("retrieved userId: " + userID);
Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
===================================================================
diff -u -red40abcc81d077dd1c01791195ac0f0cff0a6dbe -r8d0b1de3acd411878ccc28b222e49c4fe4641aa7
--- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision ed40abcc81d077dd1c01791195ac0f0cff0a6dbe)
+++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision 8d0b1de3acd411878ccc28b222e49c4fe4641aa7)
@@ -31,6 +31,7 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
+
 	<!--options content goes here-->
 				<table align=center bgcolor="#FFFFFF">
 					  <tr>
@@ -199,7 +200,8 @@
 				 		</td>
 			  	   </tr>
 
-		 		<c:if test="${sessionScope.totalCountReached != 'true'}"> 		
+
+		  		<c:if test="${sessionScope.totalCountReached != 'true'  &&  sessionScope.totalQuestionCount != '1'}"> 			
 	  	   		  <tr>
 				  	<td NOWRAP colspan=2 align=right class="input" valign=top> 
 					  	<font size=2>
@@ -211,6 +213,18 @@
 				  </tr>
 				</c:if> 								  
 
+		 		<c:if test="${sessionScope.totalQuestionCount == '1'}"> 		
+	  	   		  <tr>
+				  	<td NOWRAP colspan=2 align=right class="input" valign=top> 
+					  	<font size=2>
+				  			<html:submit property="continueOptionsCombined" styleClass="button">
+								<bean:message key="button.continue"/>
+							</html:submit>	 				 		  					
+						</font>
+				  	 </td>
+				  </tr>
+				</c:if> 								  
+				
 		 		<c:if test="${sessionScope.totalCountReached == 'true'}"> 		
 	  	   		  <tr>
 				  	<td NOWRAP colspan=2 align=right class="input" valign=top>