diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp
index 8623fa6dbb9f..9d802c165e5e 100755
--- a/samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp
+++ b/samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp
@@ -112,7 +112,7 @@
  
       </head>
 	
-      <body onload="<%= request.getAttribute("html.body.onload") %>; setLocation(); checkRadio(); SaveFormContentAsync('deliverAssessment.faces', 'takeAssessmentForm', 'takeAssessmentForm:autoSave', 'takeAssessmentForm:lastSubmittedDate1', 'takeAssessmentForm:lastSubmittedDate2',  <h:outputText value="#{delivery.autoSaveRepeatMilliseconds}"/>, <h:outputText value="#{delivery.actionString=='takeAssessment'}"/>); setTimeout('setLocation2()',2)" >
+	<body>
  
       <h:outputText value="<a name='top'></a>" escape="false" />
       
@@ -595,7 +595,14 @@ document.links[newindex].onclick();
 </h:form>
 <!-- end content -->
 <f:verbatim></div></f:verbatim>
-<script type="text/JavaScript">fixImplicitLabeling();</script>
+<script type="text/JavaScript">
+	<%= request.getAttribute("html.body.onload") %> 
+	setLocation(); 
+	checkRadio();
+	fixImplicitLabeling();
+	SaveFormContentAsync('deliverAssessment.faces', 'takeAssessmentForm', 'takeAssessmentForm:autoSave', 'takeAssessmentForm:lastSubmittedDate1', 'takeAssessmentForm:lastSubmittedDate2',  <h:outputText value="#{delivery.autoSaveRepeatMilliseconds}"/>, <h:outputText value="#{delivery.actionString=='takeAssessment' or delivery.actionString=='takeAssessmentViaUrl'}"/>); 
+	setTimeout('setLocation2()',2);
+</script>
     </body>
   </html>
 </f:view>
