diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 360ba459..75773a4d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,8 @@
 == Changelog ==
+= 7.0.5 - Dec 2, 2025 =
+- **WordPress 6.9 compatibility.** The new WordPress version will be released soon. The Ecwid ecommerce shopping cart plugin is ready for the new release — everything works well in your WordPress admin and storefront pages. Feel free to upgrade your site to WordPress 6.9.
+- Internal improvements and optimizations.
+
 = 7.0.4 - Jul 15, 2025 =
 - Improved compatibility with the Jetpack plugin to ensure storefront scripts load correctly when 'Defer Non-Essential JavaScript' is enabled.
 - Applied minor fixes and general improvements for better performance and stability.
diff --git a/ecwid-shopping-cart.php b/ecwid-shopping-cart.php
index cff8e69c..977eaafd 100644
--- a/ecwid-shopping-cart.php
+++ b/ecwid-shopping-cart.php
@@ -5,7 +5,7 @@
 Description: Ecwid by Lightspeed is a full-featured shopping cart. It can be easily integrated with any Wordpress blog and takes less than 5 minutes to set up.
 Text Domain: ecwid-shopping-cart
 Author: Ecwid Ecommerce
-Version: 7.0.4
+Version: 7.0.5
 Author URI: https://go.lightspeedhq.com/ecwid-site
 License: GPLv2 or later
 */
diff --git a/includes/class-ecwid-oauth.php b/includes/class-ecwid-oauth.php
index 61b6c8d3..382ff866 100644
--- a/includes/class-ecwid-oauth.php
+++ b/includes/class-ecwid-oauth.php
@@ -107,6 +107,7 @@ public function process_authorization() {
 		$redirect_uri = $this->check_url_for_idn_format( $redirect_uri );
 
 		$params['code']          = sanitize_text_field( wp_unslash( $_REQUEST['code'] ) );
+        $params['store_id']      = sanitize_text_field( wp_unslash( $_REQUEST['store_id'] ) );
 		$params['client_id']     = Ecwid_Config::get_oauth_appid();
 		$params['client_secret'] = Ecwid_Config::get_oauth_appsecret();
 		$params['redirect_uri']  = $redirect_uri;
@@ -115,7 +116,7 @@ public function process_authorization() {
 
 		$request = Ecwid_HTTP::create_post(
 			'oauth_authorize',
-			Ecwid_Config::get_oauth_token_url(),
+			Ecwid_Config::get_oauth_token_url() . '/' . $params['store_id'],
 			array(
 				Ecwid_HTTP::POLICY_RETURN_VERBOSE,
 			)
diff --git a/includes/integrations/class-ecwid-integration-google-sitemap-generator.php b/includes/integrations/class-ecwid-integration-google-sitemap-generator.php
index 91e5294e..528ab602 100644
--- a/includes/integrations/class-ecwid-integration-google-sitemap-generator.php
+++ b/includes/integrations/class-ecwid-integration-google-sitemap-generator.php
@@ -1,6 +1,8 @@
 <?php
 
 class Ecwid_Integration_Google_Sitemap_Generator {
+    public $plugin_version;
+
 	public function __construct() {
 		// Older versions of Google XML Sitemaps plugin generate it in admin, newer in site area, so the hook should be assigned in both of them
 		add_action( 'sm_buildmap', array( $this, 'build_sitemap' ) );
diff --git a/lib/ecwid_api_v3.php b/lib/ecwid_api_v3.php
index cd5dd881..aa5a9828 100644
--- a/lib/ecwid_api_v3.php
+++ b/lib/ecwid_api_v3.php
@@ -794,7 +794,7 @@ public function create_store( $params = array() ) {
 		if ( ! empty( $params['password'] ) ) {
 			$password = $params['password'];
 		} else {
-			$password = wp_generate_password( 8 );
+			$password = '';
 		}
 
 		$data = array(
diff --git a/readme.txt b/readme.txt
index 7a12a37c..aafa6969 100644
--- a/readme.txt
+++ b/readme.txt
@@ -152,6 +152,10 @@ You can use Ecwid’s built-in import tools to copy your store products from any
 * [Ecwid Help Center](http://help.ecwid.com "Ecwid Help")
 
 == Changelog ==
+= 7.0.5 - Dec 2, 2025 =
+- **WordPress 6.9 compatibility.** The new WordPress version will be released soon. The Ecwid ecommerce shopping cart plugin is ready for the new release — everything works well in your WordPress admin and storefront pages. Feel free to upgrade your site to WordPress 6.9.
+- Internal improvements and optimizations.
+
 = 7.0.4 - Jul 15, 2025 =
 - Improved compatibility with the Jetpack plugin to ensure storefront scripts load correctly when 'Defer Non-Essential JavaScript' is enabled.
 - Applied minor fixes and general improvements for better performance and stability.
diff --git a/templates/importer/woo-main.tpl.php b/templates/importer/woo-main.tpl.php
index d4d83158..7cbe1f26 100644
--- a/templates/importer/woo-main.tpl.php
+++ b/templates/importer/woo-main.tpl.php
@@ -16,7 +16,7 @@
 			<div class="named-area__header">
 				<div class="named-area__titles">
 					<div class="named-area__title"><?php esc_html_e( 'Update your catalog', 'ecwid-shopping-cart' ); ?></div>
-					<div class="named-area__subtitle"><?php echo esc_html__( sprintf( __( 'This import will copy your WooCommerce products and categories to your %s store.', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ) ); ?></div>
+					<div class="named-area__subtitle"><?php echo esc_html( sprintf( __( 'This import will copy your WooCommerce products and categories to your %s store.', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ) ); ?></div>
 				</div>
 			</div>
 			<div class="named-area__body">