diff --git a/VERSION b/VERSION
index 2ae02c75..c724d0ca 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.9.5-trunk+timestamp.2014.05.26.23.47.54
+Version 2.9.5-trunk+timestamp.2014.05.26.23.54.55
diff --git a/applications/welcome/views/default/user.html b/applications/welcome/views/default/user.html
index 0db230b7..c734db86 100644
--- a/applications/welcome/views/default/user.html
+++ b/applications/welcome/views/default/user.html
@@ -18,7 +18,7 @@ pass
 jQuery("#web2py_user_form input:visible:enabled:first").focus();
 {{if request.args(0)=='register':}}
     web2py_validate_entropy(jQuery('#auth_user_password'),100);
-{{elif request.args(0)=='change_password':}}
+{{elif request.args(0) in ('change_password','reset_password'):}}
     web2py_validate_entropy(jQuery('#no_table_new_password'),100);
 {{pass}}
 //--></script>