diff --git a/src/main/java/com/minecolonies/core/colony/CitizenData.java b/src/main/java/com/minecolonies/core/colony/CitizenData.java
index e0276347d15..39a3466e29f 100755
--- a/src/main/java/com/minecolonies/core/colony/CitizenData.java
+++ b/src/main/java/com/minecolonies/core/colony/CitizenData.java
@@ -1,5 +1,6 @@
 package com.minecolonies.core.colony;
 
+import com.minecolonies.api.IMinecoloniesAPI;
 import com.minecolonies.api.MinecoloniesAPIProxy;
 import com.minecolonies.api.colony.CitizenNameFile;
 import com.minecolonies.api.colony.ICitizenData;
@@ -497,8 +498,12 @@ public void initForNewCivilian()
         textureId = random.nextInt(255);
 
         saturation = MAX_SATURATION;
-        final int levelCap = (int) colony.getOverallHappiness();
 
+        int levelCap = (int) colony.getOverallHappiness() * 2;
+        if (colony.getCitizenManager().getCitizens().size() < IMinecoloniesAPI.getInstance().getConfig().getServer().initialCitizenAmount.get())
+        {
+            levelCap = Math.max(5, levelCap);
+        }
         citizenSkillHandler.init(levelCap);
 
         markDirty(0);