diff --git a/VERSION b/VERSION
index 7bd36900..9fa761cc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-09 23:55:13) dev
+Version 2.00.0 (2012-07-10 00:22:32) dev
diff --git a/applications/welcome/views/default/user.html b/applications/welcome/views/default/user.html
index 61b72036..c6c28aca 100644
--- a/applications/welcome/views/default/user.html
+++ b/applications/welcome/views/default/user.html
@@ -1,13 +1,17 @@
 {{extend 'layout.html'}}
 <h2>{{=T( request.args(0).replace('_',' ').capitalize() )}}</h2>
 <div id="web2py_user_form">
-    {{if request.args(0)=='login':}}
-    {{if not 'register' in auth.settings.actions_disabled:}}
-    {{form.add_button(T('Register'),URL(args='register'))}}
-    {{pass}}
-    {{form.add_button(T('Lost Password'),URL(args='request_reset_password'))}}
-    {{pass}}
-    {{=form}}
+{{
+if request.args(0)=='login':
+    if not 'register' in auth.settings.actions_disabled:
+        form.add_button(T('Register'),URL(args='register'))
+    pass
+    if not 'request_reset_password' in auth.settings.actions_disabled:
+        form.add_button(T('Lost Password'),URL(args='request_reset_password'))
+    pass
+pass
+=form
+}}
 </div>
 <script language="javascript"><!--
       jQuery("#web2py_user_form input:visible:enabled:first").focus();