diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h
index 68d6da0c5..5aded6b9a 100644
--- a/src/common/settings-eressea.h
+++ b/src/common/settings-eressea.h
@@ -30,8 +30,8 @@
 #define SKILLPOINTS 0
 #define NEW_MIGRATION 1
 #define PEASANTS_DO_NOT_STARVE 0
-#define GUARD_DISABLES_RECRUIT 1
-#define GUARD_DISABLES_PRODUCTION 1
+#define GUARD_DISABLES_RECRUIT 0
+#define GUARD_DISABLES_PRODUCTION 0
 #define RESOURCE_QUANTITY 1.0
 #define RECRUITFRACTION 5
 #define CATAPULT_AMMUNITION 0	/* Gebaut werden kann sie auch mit 0! */
diff --git a/src/mapper/map_units.c b/src/mapper/map_units.c
index b6e796a29..065266b34 100644
--- a/src/mapper/map_units.c
+++ b/src/mapper/map_units.c
@@ -1480,10 +1480,20 @@ showunits(region * r)
 				refresh();
 			} else {
 				if ((s = strchr(pointer->s, '('))!=NULL) {
+					char idbuf[12];
+					int  i = 0;
+
 					s++;
-					f  = atoi36(s);
-					f2 = atoi36(s);
-					if (f || f2)
+					while(*s != ')') {
+						idbuf[i] = *s;
+						i++; s++;
+						assert(i<=11);
+					}
+					idbuf[i] = '\0';
+
+					f  = atoi36(idbuf);
+					
+					if (f)
 						switch (pointer->s[0]) {
 						case '\025':
 							clipunit = findunit(f, r);