diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index 2c79b6aa..72d31137 100644
--- a/src/core/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
@@ -131,6 +131,9 @@ void CControllerConfigManager::LoadSettings(int32 file)
 {
 	bool bValid = true;
 	int nVersion = 0;
+#ifdef BIND_VEHICLE_FIREWEAPON
+	bool skipVehicleFireWeapon = false;
+#endif
 
 	if (file)
 	{
@@ -148,11 +151,26 @@ void CControllerConfigManager::LoadSettings(int32 file)
 	if (bValid && nVersion >= 3)
 	{
 		ControlsManager.MakeControllerActionsBlank();
+#ifdef BIND_VEHICLE_FIREWEAPON
+		skipVehicleFireWeapon = nVersion < 4;
+		// Set the default settings of VEHICLE_FIREWEAPON
+		if (skipVehicleFireWeapon) {
+			SetControllerKeyAssociatedWithAction(VEHICLE_FIREWEAPON, rsPADINS, KEYBOARD);
+			SetControllerKeyAssociatedWithAction(VEHICLE_FIREWEAPON, rsLCTRL, OPTIONAL_EXTRA);
+			if (m_bMouseAssociated)
+				SetMouseButtonAssociatedWithAction(VEHICLE_FIREWEAPON, 1);
+		}
+#endif
 
 		for (int32 i = 0; i < MAX_CONTROLLERTYPES; i++)
 		{
 			for (int32 j = 0; j < MAX_CONTROLLERACTIONS; j++)
 			{
+#ifdef BIND_VEHICLE_FIREWEAPON
+				// Skip file read
+				if (skipVehicleFireWeapon && j == VEHICLE_FIREWEAPON)
+					continue;
+#endif
 				CFileMgr::Read(file, (char *)&ControlsManager.m_aSettings[j][i], sizeof(tControllerConfigBind));
 			}
 		}
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 97525388..4c847596 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -3135,7 +3135,11 @@ CMenuManager::SaveSettings()
 {
 #ifndef LOAD_INI_SETTINGS
 	static char RubbishString[48] = "stuffmorestuffevenmorestuff                 etc";
+#ifdef BIND_VEHICLE_FIREWEAPON
+	static int SomeVersion = 4;
+#else
 	static int SomeVersion = 3;
+#endif
 
 	CFileMgr::SetDirMyDocuments();
 
diff --git a/src/core/config.h b/src/core/config.h
index 152ba336..4d2ad3bf 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -307,7 +307,7 @@ enum Config {
 #define BETTER_ALLCARSAREDODO_CHEAT
 #define WALLCLIMB_CHEAT
 #define REGISTER_START_BUTTON
-//#define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls
+#define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls
 #define BUTTON_ICONS // use textures to show controller buttons
 
 // Hud, frontend and radar