diff --git a/opm/autodiff/FlowMainEbos.hpp b/opm/autodiff/FlowMainEbos.hpp
index 901bf6713..5c9d4a318 100755
--- a/opm/autodiff/FlowMainEbos.hpp
+++ b/opm/autodiff/FlowMainEbos.hpp
@@ -608,7 +608,7 @@ namespace Opm
 
         void writeInit()
         {
-            bool output      = param_.getDefault("output", true);
+            bool output      = ( output_ > OUTPUT_NONE );
             bool output_ecl  = param_.getDefault("output_ecl", true);
             if( output && output_ecl && grid().comm().rank() == 0 )
             {
diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
index b58eb30c5..e34fc23e4 100644
--- a/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
+++ b/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
@@ -338,7 +338,16 @@ namespace Opm
                          const Opm::EclipseState& eclipseState,
                          std::unique_ptr<EclipseIO>&& eclIO,
                          const Opm::PhaseUsage &phaseUsage)
-      : output_( param.getDefault("output", true) ),
+        : output_( [&param](){
+                // If output parameter is true or all, then we do output
+                std::string outputString = param.getDefault("output", std::string("all"));
+                if ( outputString == "all" || outputString == "log" ||
+                     outputString == "true" )
+                {
+                    return true;
+                }
+                return false;}()
+            ),
         parallelOutput_( output_ ? new ParallelDebugOutput< Grid >( grid, eclipseState, phaseUsage.num_phases, phaseUsage ) : 0 ),
         outputDir_( eclipseState.getIOConfig().getOutputDir() ),
         restart_double_si_( output_ ? param.getDefault("restart_double_si", false) : false ),