diff --git a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
index 5647585..2053dbb 100644
--- a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
+++ b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
@@ -93,12 +93,16 @@ public class LoginActivity extends AppCompatActivity implements
 		super.onStart();
 		Log.v(TAG, "Started. Checking for intent method");
 
+		// Just logged out - don't sign back in
 		if (getIntent().hasExtra("method")) {
 			Log.v(TAG, "Intent has method extra");
 			if (getIntent().getStringExtra("method").equals("signOut")) {
 				Log.d(TAG, "Got intent to sign out");
 			}
-		} else { // Try to sign in
+		}
+
+		// Try to sign in
+		else {
 			Log.v(TAG, "Trying to sign in...");
 			OptionalPendingResult<GoogleSignInResult> opr = Auth.GoogleSignInApi.silentSignIn(mGoogleApiClient);
 			if (opr.isDone()) {
diff --git a/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java b/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
index 7d6acb8..3dc3dfc 100644
--- a/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
+++ b/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
@@ -205,7 +205,13 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 
 	@Override
 	public void onBackPressed() {
-		super.onBackPressed();
+//		super.onBackPressed();
+
+		//TODO: #8 Set intent to not log back in again
+		Intent signOutIntent = new Intent();
+		signOutIntent.putExtra("method","signOut");
+//		startActivity(signOutIntent, LoginActivity);
+
 	}
 
 	@Override