Index: src/client/cl_basemanagement.c
===================================================================
--- src/client/cl_basemanagement.c	(revision 7734)
+++ src/client/cl_basemanagement.c	(working copy)
@@ -572,11 +572,27 @@
 
 			/* update the building-list */
 			B_BuildingInit();
-
+			 /* We want two Living Quarters in first base. at position 3 1 */
+			 if (i == B_QUARTERS) {
+                               building = &gd.buildings[base->idx][gd.numBuildings[base->idx]];
+                               memcpy(building, &gd.buildingTypes[i], sizeof(building_t));
+                               building->idx = gd.numBuildings[base->idx];
+                               gd.numBuildings[base->idx]++;
+                               building->base_idx = base->idx;
+                               base->buildingCurrent = building;
+                               B_SetBuildingByClick(3, 1);
+                               B_UpdateBaseBuildingStatus(building, base, B_STATUS_WORKING);
+                               B_BuildingInit();
+                       }
+                       /* We have here updated capacities, so we should be able to hire employees for both Quarters. */
 			if (cl_start_employees->value)
 				B_HireForBuilding(base, building, -1);
 		}
 	}
 	/* if no autobuild, set up zero build time for the first base */