diff --git a/app/src/main/java/us/keithirwin/tracman/LocationService.java b/app/src/main/java/us/keithirwin/tracman/LocationService.java
index 2be83b1..d37335f 100644
--- a/app/src/main/java/us/keithirwin/tracman/LocationService.java
+++ b/app/src/main/java/us/keithirwin/tracman/LocationService.java
@@ -45,7 +45,10 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 	final int ICON_ON = 2;
 	final int ICON_HALF = 1;
 	final int ICON_OFF = 0;
-	final String SERVER_ADDRESS = "https://dev.tracman.org";
+	// Development
+//	final String SERVER_ADDRESS = "https://dev.tracman.org";
+	// Production
+	final String SERVER_ADDRESS = "https://tracman.org";
 
 	private Socket socket;
 	private String mUserID;
diff --git a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
index 462aa7e..0a8b70f 100644
--- a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
+++ b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
@@ -50,11 +50,11 @@ public class LoginActivity extends AppCompatActivity implements
 	private static boolean DONT_LOG_IN = false;
 
 	// Development
-	private final String SERVER_ADDRESS = "https://dev.tracman.org/";
-	private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hps4p2pcu3ctshjvqm3pqdbg0t0q281o.apps.googleusercontent.com";
+//	private final String SERVER_ADDRESS = "https://dev.tracman.org/";
+//	private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hps4p2pcu3ctshjvqm3pqdbg0t0q281o.apps.googleusercontent.com";
 	// Production
-//	private final String SERVER_ADDRESS = "https://tracman.org/";
-//	private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hrn0ms1tebgdtfs5f4i6ebmkt3qmo16o.apps.googleusercontent.com";
+	private final String SERVER_ADDRESS = "https://tracman.org/";
+	private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hrn0ms1tebgdtfs5f4i6ebmkt3qmo16o.apps.googleusercontent.com";
 
 	private GoogleApiClient mGoogleApiClient;
 	private ProgressDialog mProgressDialog;