diff --git a/application/controllers/admin/ConditionsAction.php b/application/controllers/admin/ConditionsAction.php
index 5cd1bed8059..24563ba6643 100644
--- a/application/controllers/admin/ConditionsAction.php
+++ b/application/controllers/admin/ConditionsAction.php
@@ -1183,10 +1183,13 @@ protected function applySubaction($p_subaction, array $args)
                 break;
             // Update scenario
             case "updatescenario":
-                // TODO: Check if $p_newscenarionum is null
-                Condition::model()->insertRecords(array('scenario' => $p_newscenarionum), true, array(
-                    'qid' => $qid, 'scenario' => $p_scenario));
-                LimeExpressionManager::UpgradeConditionsToRelevance(null, $qid);
+                if (is_null($p_newscenarionum)) {
+                    Yii::app()->setFlashMessage(gT("No scenario number specified"), 'error');
+                } else {
+                    Condition::model()->insertRecords(array('scenario' => $p_newscenarionum), true, array(
+                        'qid' => $qid, 'scenario' => $p_scenario));
+                    LimeExpressionManager::UpgradeConditionsToRelevance(null, $qid);
+                }
                 break;
             // Delete all conditions for this question
             case "deleteallconditions":
diff --git a/application/views/admin/conditions/includes/conditions_scenario.php b/application/views/admin/conditions/includes/conditions_scenario.php
index bce510816cd..845bcda4d6a 100644
--- a/application/views/admin/conditions/includes/conditions_scenario.php
+++ b/application/views/admin/conditions/includes/conditions_scenario.php
@@ -31,7 +31,7 @@
                 <?php echo CHtml::form(array("/admin/conditions/sa/index/subaction/updatescenario/surveyid/{$surveyid}/gid/{$gid}/qid/{$qid}/"), 'post', array('style'=>'display: none','id'=>'editscenario'.$scenarionr['scenario']));?>
                     <label>
                         <?php eT("New scenario number:"); ?>&nbsp;
-                        <input type='text' name='newscenarionum' size='3'/>
+                        <input type='text' name='newscenarionum' size='3' value='<?php echo $scenarionr['scenario']; ?>' required/>
                     </label>
                     <input type='hidden' name='scenario' value='<?php echo $scenarionr['scenario']; ?>'/>
                     <input type='hidden' name='sid' value='<?php echo $surveyid; ?>' />