--- a/src/ztfy/myams/resources/js/myams.js	Wed May 07 17:59:51 2014 +0200
+++ b/src/ztfy/myams/resources/js/myams.js	Wed May 07 18:01:01 2014 +0200
@@ -1061,8 +1061,8 @@
 			if (message)
 				spin += '<strong class="submit-message align-top padding-left-10 margin-top-10">' + message + '</strong>';
 			var footer = $('footer', form);
-			form.data('ams-form-footer', footer.html());
-			footer.html('<div class="row"><div class="text-center">' + spin + '</div></div>');
+			$('button', footer).hide();
+			footer.append('<div class="row"><div class="text-center">' + spin + '</div></div>');
 		},
 
 		/**
@@ -1073,10 +1073,10 @@
 		 */
 		finalizeSubmitFooter: function(target) {
 			var form = $(this);
-			var footer = form.data('ams-form-footer');
+			var footer = $('footer', form);
 			if (footer) {
-				$('footer', form).html(footer);
-				form.removeData('ams-form-footer');
+				$('.row', footer).remove();
+				$('button', footer).show();
 			}
 		},
 
@@ -3020,7 +3020,8 @@
 		ams.plugins.enabled.hint(document);
 
 		// Init content when not loaded by AJAX request
-		if (window.location.hash == '')
+		// or when redirecting to authentication page...
+		if ((window.location.hash == '') || (ams.getQueryVar(window.location.href, 'came_from') != false))
 			ams.initContent(document);
 
 	};