diff --git a/apps/opencs/model/settings/usersettings.cpp b/apps/opencs/model/settings/usersettings.cpp
index 78db5313b..3e59d0582 100644
--- a/apps/opencs/model/settings/usersettings.cpp
+++ b/apps/opencs/model/settings/usersettings.cpp
@@ -312,17 +312,18 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
             "\nA name from the list of colors defined in the list of SVG color keyword names."
             "\nX11 color names may also work.";
 
-        QString modeIgnore ("Ignore");
+        QString modeNormal ("Normal");
 
         QStringList modes;
-        modes << modeIgnore << "Strict";
+        modes << "Ignore" << modeNormal << "Strict";
             
         Setting *warnings = createSetting (Type_ComboBox, "warnings",
             "Warning Mode");
         warnings->setDeclaredValues (modes);
-        warnings->setDefaultValue (modeIgnore);
+        warnings->setDefaultValue (modeNormal);
         warnings->setToolTip ("<ul>How to handle warning messages during compilation:<p>"
         "<li>Ignore: Do not report warning</li>"
+        "<li>Normal: Report warning as a warning</li>"
         "<li>Strict: Promote warning to an error</li>"
         "</ul>");
         
diff --git a/apps/opencs/model/tools/scriptcheck.cpp b/apps/opencs/model/tools/scriptcheck.cpp
index 190b146c9..928ae156f 100644
--- a/apps/opencs/model/tools/scriptcheck.cpp
+++ b/apps/opencs/model/tools/scriptcheck.cpp
@@ -84,7 +84,8 @@ void CSMTools::ScriptCheckStage::perform (int stage, CSMDoc::Messages& messages)
     switch (mWarningMode)
     {
         case Mode_Ignore: setWarningsMode (0); break;
-        case Mode_Strict: setWarningsMode (1); break;
+        case Mode_Normal: setWarningsMode (1); break;
+        case Mode_Strict: setWarningsMode (2); break;
     }
 
     try
@@ -123,6 +124,8 @@ void CSMTools::ScriptCheckStage::updateUserSetting (const QString& name, const Q
     {
         if (value.at (0)=="Ignore")
             mWarningMode = Mode_Ignore;
+        else if (value.at (0)=="Normal")
+            mWarningMode = Mode_Normal;
         else if (value.at (0)=="Strict")
             mWarningMode = Mode_Strict;
     }
diff --git a/apps/opencs/model/tools/scriptcheck.hpp b/apps/opencs/model/tools/scriptcheck.hpp
index 97c50a1eb..3f0276652 100644
--- a/apps/opencs/model/tools/scriptcheck.hpp
+++ b/apps/opencs/model/tools/scriptcheck.hpp
@@ -21,6 +21,7 @@ namespace CSMTools
             enum WarningMode
             {
                 Mode_Ignore,
+                Mode_Normal,
                 Mode_Strict
             };