diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index cc7e5f867..025ee6c8c 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -537,7 +537,7 @@ class AuthControllerCore extends FrontController
 				$contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0;
 				$id_state = isset($address) && is_object($address) ? (int)$address->id_state: 0;
 				if ((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state)
-					$this->errors[] = Tools::displayError('This country requires you to chose a State.');
+					$this->errors[] = Tools::displayError('This country requires you to choose a State.');
 				else
 				{
 					$customer->active = 1;
diff --git a/themes/default/js/order-opc.js b/themes/default/js/order-opc.js
index 162f95553..88c1d2af3 100644
--- a/themes/default/js/order-opc.js
+++ b/themes/default/js/order-opc.js
@@ -445,6 +445,7 @@ $(function() {
 				$('#is_new_customer').val('0');
 				$('#opc_account_choice, #opc_invoice_address').hide();
 				$('#new_account_title').html(txtInstantCheckout);
+				$('#submitAccount').prop({id : 'submitGuestAccount', name : 'submitGuestAccount'});
 				updateState();
 				updateNeedIDNumber();
 				updateZipCode();
diff --git a/themes/default/order-address.tpl b/themes/default/order-address.tpl
index 47097680f..3b4573243 100644
--- a/themes/default/order-address.tpl
+++ b/themes/default/order-address.tpl
@@ -104,7 +104,6 @@
 		};
 	}
 
-
 	function buildAddressBlock(id_address, address_type, dest_comp)
 	{
 		var adr_titles_vals = getAddressesTitles();
diff --git a/themes/default/order-opc-new-account.tpl b/themes/default/order-opc-new-account.tpl
index 1743028be..f34a384a5 100644
--- a/themes/default/order-opc-new-account.tpl
+++ b/themes/default/order-opc-new-account.tpl
@@ -215,7 +215,6 @@
 				<p class="required text">
 					<label for="city">{l s='City'} <sup>*</sup></label>
 					<input type="text" class="text" name="city" id="city" value="{if isset($guestInformations) && $guestInformations.city}{$guestInformations.city}{/if}" />
-					
 				</p>
 				{elseif $field_name eq "country" || $field_name eq "Country:name"}
 				<p class="required select">