diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/TeamNumberPage.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/TeamNumberPage.java
index 3e3728b3fc..5345f48a36 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/TeamNumberPage.java
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/TeamNumberPage.java
@@ -77,8 +77,8 @@ public class TeamNumberPage extends WizardPage {
 	private void dialogChanged() {
 		String teamNumber = getTeamNumber();
 		if (listener != null) listener.stateChanged(null); 
-		if (!teamNumber.matches("^([0-9]+)$")) {
-			updateStatus("Team number must be a valid integer.");
+		if (!teamNumber.matches("^([1-9][0-9]*)$")) {
+			updateStatus("Team number must be a valid integer without leading zeroes.");
 			return;
 		}
 		updateStatus(null);