diff --git a/conf/e2/config.xml b/conf/e2/config.xml
index 435bd5005..0ff1d67ee 100644
--- a/conf/e2/config.xml
+++ b/conf/e2/config.xml
@@ -90,7 +90,7 @@
     <param name="entertain.base" value="0"/>
     <param name="entertain.perlevel" value="20"/>
     <param name="nmr.timeout" value="5"/>
-    <param name="nmr.removenewbie" value="10"/>
+    <param name="nmr.removenewbie" value="0"/>
     <param name="GiveRestriction" value="3"/>
     <param name="hunger.long" value="1"/>
     <param name="init_spells" value="0"/>
diff --git a/scripts/populate.lua b/scripts/populate.lua
index dfd07b5dd..5df2ad92f 100644
--- a/scripts/populate.lua
+++ b/scripts/populate.lua
@@ -6,7 +6,7 @@ local function score(r, res)
     local x, y, rn
     local peas = r:get_resource(res)
     for _, rn in pairs(r.adj) do
-        if rn then
+        if rn and not rn.units() then
             peas = peas + rn:get_resource(res)
         end
     end
@@ -16,7 +16,7 @@ end
 local function select(regions, limit)
     local sel = {}
     for r in regions do
-        if r.terrain~="ocean" and r.units()==nil then
+        if r.terrain~="ocean" and not r.units() then
             s = score(r)
             if s >= limit then
                 table.insert(sel, r)
diff --git a/scripts/tests/common.lua b/scripts/tests/common.lua
index b4800761f..fb1a29965 100644
--- a/scripts/tests/common.lua
+++ b/scripts/tests/common.lua
@@ -26,7 +26,6 @@ module("tests.common", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("NewbieImmunity", "0")
     eressea.settings.set("rules.economy.food", "4")
@@ -961,7 +960,6 @@ module("tests.report", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("rules.economy.food", "4")
 end
diff --git a/scripts/tests/e2/guard.lua b/scripts/tests/e2/guard.lua
index 1afd011e9..b1c9d9c4f 100644
--- a/scripts/tests/e2/guard.lua
+++ b/scripts/tests/e2/guard.lua
@@ -4,7 +4,6 @@ module("tests.e2.guard", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("NewbieImmunity", "0")
     eressea.settings.set("rules.economy.food", "4")
diff --git a/scripts/tests/e2/movement.lua b/scripts/tests/e2/movement.lua
index ef62873d8..7e20e41ca 100644
--- a/scripts/tests/e2/movement.lua
+++ b/scripts/tests/e2/movement.lua
@@ -4,7 +4,6 @@ module("tests.e2.movement", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("NewbieImmunity", "0")
 end
diff --git a/scripts/tests/e2/shiplanding.lua b/scripts/tests/e2/shiplanding.lua
index 2d9225b8d..a46a7da37 100644
--- a/scripts/tests/e2/shiplanding.lua
+++ b/scripts/tests/e2/shiplanding.lua
@@ -4,7 +4,6 @@ module("tests.e2.shiplanding", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("NewbieImmunity", "0")
 end
diff --git a/scripts/tests/e3/spells.lua b/scripts/tests/e3/spells.lua
index 7afe96d8e..c4f0aadaf 100644
--- a/scripts/tests/e3/spells.lua
+++ b/scripts/tests/e3/spells.lua
@@ -5,7 +5,6 @@ module("tests.e3.spells", package.seeall, lunit.testcase)
 function setup()
     eressea.game.reset()
     eressea.settings.set("magic.fumble.enable", "0")
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("rules.peasants.growth", "0")
 end
diff --git a/scripts/tests/movement.lua b/scripts/tests/movement.lua
index e27831cc8..110b5b2a2 100644
--- a/scripts/tests/movement.lua
+++ b/scripts/tests/movement.lua
@@ -4,7 +4,6 @@ module("tests.movement", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("rules.ships.storms", "0")
     conf = [[{
diff --git a/scripts/tests/orders.lua b/scripts/tests/orders.lua
index 98115f644..d9443c9c4 100644
--- a/scripts/tests/orders.lua
+++ b/scripts/tests/orders.lua
@@ -16,7 +16,6 @@ function setup()
     u = _G.unit.create(f, r, 1)
     u:clear_orders()
     eressea.settings.set("rules.economy.food", "4")
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("NewbieImmunity", "0")
 end
diff --git a/scripts/tests/pool.lua b/scripts/tests/pool.lua
index 3ee3d54db..bf32eda87 100644
--- a/scripts/tests/pool.lua
+++ b/scripts/tests/pool.lua
@@ -6,7 +6,6 @@ function setup()
     eressea.game.reset()
     eressea.config.reset()
     eressea.settings.set("rules.economy.food", "0")
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("rules.magic.playerschools", "")
     conf = [[{
diff --git a/src/laws.c b/src/laws.c
index e5d9392f3..d49e7ae73 100755
--- a/src/laws.c
+++ b/src/laws.c
@@ -113,7 +113,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* - exported global symbols ----------------------------------- */
 
-static int RemoveNMRNewbie(void)
+static bool RemoveNMRNewbie(void)
 {
     static int value = -1;
     static int gamecookie = -1;
@@ -122,7 +122,7 @@ static int RemoveNMRNewbie(void)
         value = get_param_int(global.parameters, "nmr.removenewbie", 0);
         gamecookie = global.cookie;
     }
-    return value;
+    return value!=0;
 }
 
 static void age_unit(region * r, unit * u)