--- a/QTfrontend/hwform.cpp	Mon Oct 02 18:12:23 2017 +0200
+++ b/QTfrontend/hwform.cpp	Mon Oct 02 20:59:40 2017 +0200
@@ -461,15 +461,19 @@
     {
         QString currentNickName = config->value("net/nick",tr("Guest")+QString("%1").arg(rand())).toString().toUtf8();
         QString teamName;
+        int firstHumanTeam = 1;
+        int lastHumanTeam = 5;
 
         // Default team
         if (currentNickName.isEmpty())
         {
             teamName = tr("Team 1");
+            firstHumanTeam++;
         }
         else
         {
             teamName = tr("%1's Team").arg(currentNickName);
+            lastHumanTeam--;
         }
 
         HWTeam defaultTeam(teamName);
@@ -481,9 +485,12 @@
         defaultTeam.saveToFile();
         teamslist.push_back(teamName);
 
-        // Add 3 additional teams to allow local multiplayer instantly
-        for(int i=2; i<=4; i++)
+        // Add additional default teams
+
+        // 4 human teams to allow local multiplayer instantly
+        for(int i=firstHumanTeam; i<=lastHumanTeam; i++)
         {
+            //: Default team name
             teamName = tr("Team %1").arg(i);
             HWTeam numberTeam(teamName);
             HWNamegen::teamRandomGrave(numberTeam, false);
@@ -491,6 +498,18 @@
             numberTeam.saveToFile();
             teamslist.push_back(teamName);
         }
+        // Add default CPU teams for each level
+        for(int i=1; i<=5; i++)
+        {
+            //: Default computer team name
+            teamName = tr("Computer %1").arg(i);
+            HWTeam numberTeam(teamName);
+            HWNamegen::teamRandomGrave(numberTeam, false);
+            HWNamegen::teamRandomFort(numberTeam, false);
+            numberTeam.setDifficulty(6-i);
+            numberTeam.saveToFile();
+            teamslist.push_back(teamName);
+        }
     }
 
     ui.pageOptions->CBTeamName->clear();