--- a/src/waypoint.cpp	Sat Aug 23 18:05:52 2008 +0000
+++ b/src/waypoint.cpp	Sat Aug 23 19:14:27 2008 +0000
@@ -231,7 +231,6 @@
 			wp->town_index = INVALID_TOWN;
 			wp->name = NULL;
 			wp->town_cn = 0;
-			wp->owner = owner;
 		} else {
 			/* Move existing (recently deleted) waypoint to the new location */
 
@@ -251,6 +250,7 @@
 			wp->xy = tile;
 			InvalidateWindowData(WC_WAYPOINT_VIEW, wp->index);
 		}
+		wp->owner = owner;
 
 		const StationSpec* statspec;