diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl
index 8141e48f3..12c706598 100755
--- a/admin-dev/themes/default/template/controllers/login/content.tpl
+++ b/admin-dev/themes/default/template/controllers/login/content.tpl
@@ -29,7 +29,7 @@
var label_error = '{l s='error'}';
-
+
{if isset($errors)}
{if $nbErrors > 1}{l s='There are %d errors.' sprintf=$nbErrors}{else}{l s='There is %d error.' sprintf=$nbErrors}{/if}
diff --git a/js/login.js b/js/login.js
index 75fc36cef..bfbb53e01 100644
--- a/js/login.js
+++ b/js/login.js
@@ -32,7 +32,7 @@ $(document).ready(function() {
function displayForgotPassword() {
$('#error').hide();
$('#login_form').fadeOut('fast', function () {
- $("#forgot_password_form").fadeIn('fast');
+ $("#forgot_password_form").removeClass('hide').fadeIn('fast');
// Focus on email address forgot field
$('#email_forgot').select();
});
@@ -81,7 +81,7 @@ function doAjaxLogin(redirect) {
window.location.assign(jsonData.redirect);
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
- $('#error').html('TECHNICAL ERROR:
Details: Error thrown: ' + XMLHttpRequest + '
Text status: ' + textStatus + '
').show();
+ $('#error').html('TECHNICAL ERROR:
Details: Error thrown: ' + XMLHttpRequest + '
Text status: ' + textStatus + '
').removeClass('hide');
$('#login_form .ajax-loader').fadeOut('slow');
}
});