diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl
index d5f224c9d..abcea54a3 100644
--- a/themes/default/authentication.tpl
+++ b/themes/default/authentication.tpl
@@ -123,7 +123,7 @@ $(function(){ldelim}
 					$('#noSlide').fadeOut('slow', function(){
 						$('#noSlide').html(jsonData.page);
 						// update the state (when this file is called from AJAX you still need to update the state)
-						updateState();
+						bindStateInputAndUpdate();
 					});
 					$('#noSlide').fadeIn('slow');
 					document.location = '#account-creation';
diff --git a/themes/default/js/tools/statesManagement.js b/themes/default/js/tools/statesManagement.js
index 94317f785..9d306cb4b 100644
--- a/themes/default/js/tools/statesManagement.js
+++ b/themes/default/js/tools/statesManagement.js
@@ -1,12 +1,15 @@
-$(document).ready(function(){
+$(document).ready(function()
+{	
+	bindStateInputAndUpdate();
+});
+
+function bindStateInputAndUpdate()
+{
 	$('select#id_country').change(function(){
 		updateState();
 		updateNeedIDNumber();
 		updateZipCode();
 	});
-	updateState();
-	updateNeedIDNumber();
-	updateZipCode();
 	
 	if ($('select#id_country_invoice').length != 0)
 	{
@@ -22,10 +25,15 @@ $(document).ready(function(){
 			updateZipCode('invoice');
 		}
 	}
-});
+	
+	updateState();
+	updateNeedIDNumber();
+	updateZipCode();
+}
 
 function updateState(suffix)
 {
+	console.log($('select#id_state'+(suffix !== undefined ? '_'+suffix : '')+' option:not(:first-child)'));
 	$('select#id_state'+(suffix !== undefined ? '_'+suffix : '')+' option:not(:first-child)').remove();
 	var states = countries[$('select#id_country'+(suffix !== undefined ? '_'+suffix : '')).val()];
 	if(typeof(states) != 'undefined')
@@ -37,7 +45,8 @@ function updateState(suffix)
 		$('p.id_state'+(suffix !== undefined ? '_'+suffix : '')+':hidden').slideDown('slow');
 	}
 	else
-		$('p.id_state'+(suffix !== undefined ? '_'+suffix : '')).slideUp('fast');
+		$('p.id_state'+(suffix !== undefined ? '_'+suffix : '')).hide();
+		
 }
 
 function updateNeedIDNumber(suffix)