diff --git a/nsis/pcsx2_installer_script.nsi b/nsis/pcsx2_installer_script.nsi
index c9a59789f4..beee648600 100644
--- a/nsis/pcsx2_installer_script.nsi
+++ b/nsis/pcsx2_installer_script.nsi
@@ -182,9 +182,15 @@ Section "${APP_NAME} (required)"
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 
   ; ------------------------------------------
-  ;        -- Languages and Patches --
+  ;        -- Game Database and Languages --
   ; ------------------------------------------
 
+	!insertmacro UNINSTALL.LOG_OPEN_INSTALL
+  File                                             ..\bin\DataBase.dbf
+  ; HostFS is not enabled by default, so no need to bundle it yet
+  ;File                                             ..\bin\pcsx2hostfs_ldr.elf
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+  
   ; In 0.9.7 there is only English, so including the other mo files (for now) is pointless.
   ; This code will be re-enabled when the new GUI is translated.
   
@@ -218,13 +224,19 @@ Section "${APP_NAME} (required)"
 
   File /nonfatal /oname=gsdx-sse2-r${SVNREV_GSDX}.dll    ..\bin\Plugins\gsdx-sse2.dll
   File /nonfatal /oname=gsdx-ssse3-r${SVNREV_GSDX}.dll   ..\bin\Plugins\gsdx-ssse3.dll 
-  File /nonfatal /oname=gsdx-sse4-r${SVNREV_GSDX}.dll    ..\bin\Plugins\gsdx-sse4.dll  
-  File /nonfatal /oname=spu2-x-r${SVNREV_SPU2X}.dll      ..\bin\Plugins\spu2-x.dll     
-  File /nonfatal /oname=cdvdiso-r${SVNREV_CDVDISO}.dll   ..\bin\Plugins\cdvdiso.dll    
+  File /nonfatal /oname=gsdx-sse4-r${SVNREV_GSDX}.dll    ..\bin\Plugins\gsdx-sse4.dll
+  File /nonfatal /oname=zerogs-r${SVNREV_ZEROGS}.dll     ..\bin\Plugins\zerogs.dll
+  
+  File /nonfatal /oname=spu2-x-r${SVNREV_SPU2X}.dll      ..\bin\Plugins\spu2-x.dll
+  File /nonfatal /oname=zerospu2-r${SVNREV_ZEROSPU2}.dll ..\bin\Plugins\zerospu2.dll
+  
+  File /nonfatal /oname=cdvdiso-r${SVNREV_CDVDISO}.dll   ..\bin\Plugins\cdvdiso.dll
+  File                                                   ..\bin\Plugins\cdvdGigaherz.dll
+  
   File /nonfatal /oname=lilypad-r${SVNREV_LILYPAD}.dll   ..\bin\Plugins\lilypad.dll
-
-  File /nonfatal /oname=zerogs-r${SVNREV_ZEROGS}.dll     ..\bin\Plugins\zerogs.dll     
-  File /nonfatal /oname=zerospu2-r${SVNREV_ZEROSPU2}.dll ..\bin\Plugins\zerospu2.dll   
+  File                                                   ..\bin\Plugins\PadSSSPSX.dll
+  
+  ;File                                                   ..\bin\Plugins\FWlinuz.dll
 
 !endif
 
diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp
index d20df5e550..0acd78b42a 100644
--- a/pcsx2/gui/AppInit.cpp
+++ b/pcsx2/gui/AppInit.cpp
@@ -167,9 +167,12 @@ void Pcsx2App::ReadUserModeSettings()
 		{
 			// user wiped their pcsx2.ini -- needs a reconfiguration via wizard!
 			// (we skip the first page since it's a usermode.ini thing)
-
+			
+			// Fixme : Skipping the first page is a bad idea, as it does a lot of file / directory checks on hitting Apply.
+			// If anything is missing, the first page prompts to fix it.
+			// If we skip this check, it's very likely that actions like creating Memory Cards will fail.
 			FirstTimeWizard wiz( NULL );
-			if( !wiz.RunWizard( wiz.GetPostUsermodePage() ) )
+			if( !wiz.RunWizard( /*wiz.GetPostUsermodePage()*/ wiz.GetUsermodePage() ) )
 				throw Exception::StartupAborted( L"Startup aborted: User canceled Configuration Wizard." );
 
 			// Save user's new settings
diff --git a/pcsx2/gui/Dialogs/FirstTimeWizard.cpp b/pcsx2/gui/Dialogs/FirstTimeWizard.cpp
index e18c8a4f06..0f4814714c 100644
--- a/pcsx2/gui/Dialogs/FirstTimeWizard.cpp
+++ b/pcsx2/gui/Dialogs/FirstTimeWizard.cpp
@@ -157,7 +157,7 @@ FirstTimeWizard::FirstTimeWizard( wxWindow* parent )
 	m_page_bios		+= new pxStaticHeading( &m_page_bios,
 		pxE( ".Wizard:Bios:Tutorial",
 			L"PCSX2 requires a *legal* copy of the PS2 BIOS in order to run games.\n"
-			L"You cannot use a copy obtained from a friend or the internet.\n"
+			L"You cannot use a copy obtained from a friend or the Internet.\n"
 			L"You must dump the BIOS from your *own* Playstation 2 console."
 		)
 	);