diff --git a/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java b/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
index 3dc3dfc..517f32f 100644
--- a/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
+++ b/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
@@ -205,7 +205,7 @@ 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();
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index be2caa8..5d964fd 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -7,7 +7,7 @@
 		<!-- Start on boot -->
 		<SwitchPreference
 			android:defaultValue="true"
-			android:key="start_on_boot"
+			android:key="pref_start_boot"
 			android:title="@string/pref_start_boot"
 			/>