Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java	(revision 309755)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java	(working copy)
@@ -678,7 +678,7 @@
   }
 
   public void setTimedHours(Integer timedHours) {
-    this.timedHours = timedHours;
+    this.timedHours = (timedHours==null)?0:timedHours;
   }
 
   public Integer getTimedHours() {
@@ -686,7 +686,7 @@
   }
 
   public void setTimedMinutes(Integer timedMinutes) {
-    this.timedMinutes =  timedMinutes;
+    this.timedMinutes =  (timedMinutes==null)?0:timedMinutes;
   }
 
   public Integer getTimedMinutes() {
Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java	(revision 309755)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java	(working copy)
@@ -600,7 +600,7 @@
   }
 
   public void setTimedHours(Integer timedHours) {
-    this.timedHours = timedHours;
+    this.timedHours = (timedHours==null)?0:timedHours;
   }
 
   public Integer getTimedHours() {
@@ -608,7 +608,7 @@
   }
 
   public void setTimedMinutes(Integer timedMinutes) {
-    this.timedMinutes =  timedMinutes;
+    this.timedMinutes =  (timedMinutes==null)?0:timedMinutes;
   }
 
   public Integer getTimedMinutes() {
Index: samigo-app/src/webapp/js/authoring.js
===================================================================
--- samigo-app/src/webapp/js/authoring.js	(revision 309755)
+++ samigo-app/src/webapp/js/authoring.js	(working copy)
@@ -517,6 +517,7 @@
           else
             document.getElementById(timedHourId).options[i].selected = false;
         }
+        document.getElementById(timedHourId).disabled = true;
       }
       if(document.getElementById(timedMinuteId) != null)
       {
@@ -527,14 +528,16 @@
           else
             document.getElementById(timedMinuteId).options[i].selected = false;
         }
+        document.getElementById(timedMinuteId).disabled = true;
       }
     }
     else 
     { // SAM-2121: now the "Timed Assessment" box is checked"
       // I wish we didn't have to submit this form now, but I could not get it to work properly without submitting.
-      //document.getElementById(timedHourId).disabled = false;
-      //document.getElementById(timedMinuteId).disabled = false;
-      document.forms[0].submit();
+      // SAM-2262: fixed
+      document.getElementById(timedHourId).disabled = false;
+      document.getElementById(timedMinuteId).disabled = false;
+      //document.forms[0].submit();
     }    
   }
 }
Index: samigo-app/src/webapp/jsf/author/authorSettings.jsp
===================================================================
--- samigo-app/src/webapp/jsf/author/authorSettings.jsp	(revision 309755)
+++ samigo-app/src/webapp/jsf/author/authorSettings.jsp	(working copy)
@@ -62,6 +62,7 @@
           lockdownAnonyGrading(releaseToVal);
           lockdownGradebook(releaseToVal);
           showHideReleaseGroups();
+          checkUncheckTimeBox();
         });
       </script>
 
@@ -222,11 +223,11 @@
       <h:panelGroup rendered="#{assessmentSettings.valueMap.timedAssessment_isInstructorEditable==true}" >
         <h:outputText value="#{assessmentSettingsMessages.has_time_limit} " />
         <h:selectBooleanCheckbox id="selTimeAssess" onclick="checkUncheckTimeBox();setBlockDivs();" value="#{assessmentSettings.valueMap.hasTimeAssessment}" />
-        <h:selectOneMenu id="timedHours" value="#{assessmentSettings.timedHours}" disabled="#{!assessmentSettings.valueMap.hasTimeAssessment}" >
+        <h:selectOneMenu id="timedHours" value="#{assessmentSettings.timedHours}" >
           <f:selectItems value="#{assessmentSettings.hours}" />
         </h:selectOneMenu>
         <h:outputText value="#{assessmentSettingsMessages.timed_hours} " />
-        <h:selectOneMenu id="timedMinutes" value="#{assessmentSettings.timedMinutes}" disabled="#{!assessmentSettings.valueMap.hasTimeAssessment}">
+        <h:selectOneMenu id="timedMinutes" value="#{assessmentSettings.timedMinutes}" >
           <f:selectItems value="#{assessmentSettings.mins}" />
         </h:selectOneMenu>
         <h:outputText value="#{assessmentSettingsMessages.timed_minutes} " />
Index: samigo-app/src/webapp/jsf/author/publishedSettings.jsp
===================================================================
--- samigo-app/src/webapp/jsf/author/publishedSettings.jsp	(revision 309755)
+++ samigo-app/src/webapp/jsf/author/publishedSettings.jsp	(working copy)
@@ -57,6 +57,7 @@
           lockdownQuestionLayout(navVal);
           lockdownMarkForReview(navVal);
           showHideReleaseGroups();
+          checkUncheckTimeBox();
         });
       </script>
 
@@ -212,11 +213,11 @@
       <h:panelGroup rendered="#{publishedSettings.valueMap.timedAssessment_isInstructorEditable==true}" >
         <h:outputText value="#{assessmentSettingsMessages.has_time_limit} " />
         <h:selectBooleanCheckbox id="selTimeAssess" onclick="checkUncheckTimeBox();setBlockDivs();" value="#{publishedSettings.valueMap.hasTimeAssessment}" />
-        <h:selectOneMenu id="timedHours" value="#{publishedSettings.timedHours}" disabled="#{!publishedSettings.valueMap.hasTimeAssessment}" >
+        <h:selectOneMenu id="timedHours" value="#{publishedSettings.timedHours}" >
           <f:selectItems value="#{publishedSettings.hours}" />
         </h:selectOneMenu>
         <h:outputText value="#{assessmentSettingsMessages.timed_hours} " />
-        <h:selectOneMenu id="timedMinutes" value="#{publishedSettings.timedMinutes}" disabled="#{!publishedSettings.valueMap.hasTimeAssessment}">
+        <h:selectOneMenu id="timedMinutes" value="#{publishedSettings.timedMinutes}">
           <f:selectItems value="#{publishedSettings.mins}" />
         </h:selectOneMenu>
         <h:outputText value="#{assessmentSettingsMessages.timed_minutes} " />