diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index ccdd2fe5ba..e12597981e 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -207,7 +207,7 @@ void Town::InitializeLayout(TownLayout layout)
 
 void Town::FillCachedName() const
 {
-	this->cached_name.assign(GetTownName(this));
+	this->cached_name = GetTownName(this);
 }
 
 /**
diff --git a/src/townname.cpp b/src/townname.cpp
index e1b6d1364e..557ed9c497 100644
--- a/src/townname.cpp
+++ b/src/townname.cpp
@@ -116,7 +116,11 @@ bool VerifyTownName(uint32 r, const TownNameParams *par, TownNames *town_names)
 		for (const Town *t : Town::Iterate()) {
 			/* We can't just compare the numbers since
 			 * several numbers may map to a single name. */
-			if (name == (t->name.empty() ? GetTownName(t) : t->name)) return false;
+			if (t->name.empty()) {
+				if (name == GetTownName(t)) return false;
+			} else {
+				if (name == t->name) return false;
+			}
 		}
 	}