diff --git a/better-optin.php b/better-optin.php
index 7eae780..293e895 100644
--- a/better-optin.php
+++ b/better-optin.php
@@ -237,7 +237,6 @@ private function includes() {
 				require( WPBO_PATH . 'includes/shortcode.php' );
 				require( WPBO_PATH . 'includes/functions-templating.php' );
 				require( WPBO_PATH . 'includes/functions-dummy.php' );
-				require( WPBO_PATH . 'includes/install.php' );
 
 			}
 
@@ -268,6 +267,7 @@ private function includes_admin() {
 				require( WPBO_PATH . 'includes/admin/functions-menu.php' );
 				require( WPBO_PATH . 'includes/admin/functions-metabox.php' );
 				require( WPBO_PATH . 'includes/admin/functions-list-table.php' );
+				require( WPBO_PATH . 'includes/install.php' );
 			}
 
 		}
diff --git a/includes/providers/wordpress/load.php b/includes/providers/wordpress/load.php
index e96d934..ae79a29 100644
--- a/includes/providers/wordpress/load.php
+++ b/includes/providers/wordpress/load.php
@@ -14,7 +14,11 @@
 	die;
 }
 
-if ( 'word-press' === wpbo_get_option( 'mailing_provider', '' ) ) {
+// Get the current provider
+$provider = wpbo_get_option( 'mailing_provider', '' );
+
+// Default to WP provider settings if no provider is set (used during install)
+if ( 'word-press' === $provider || empty( $provider ) ) {
 
 	// Load provider files
 	require( WPBO_PATH . 'includes/providers/wordpress/settings.php' );