diff --git a/VERSION b/VERSION
index b2900d9f..8a46f933 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.7 (2012-04-30 11:39:06) dev
+Version 1.99.7 (2012-04-30 13:45:03) dev
diff --git a/applications/welcome/views/default/user.html b/applications/welcome/views/default/user.html
index aa84a01d..61b72036 100644
--- a/applications/welcome/views/default/user.html
+++ b/applications/welcome/views/default/user.html
@@ -1,17 +1,13 @@
 {{extend 'layout.html'}}
 <h2>{{=T( request.args(0).replace('_',' ').capitalize() )}}</h2>
 <div id="web2py_user_form">
-  {{=form}}
-  {{if request.args(0)=='login':}}
-  {{if not 'register' in auth.settings.actions_disabled:}}
-  <br/>
-  <a href="{{=URL(args='register')}}">{{=T('Register')}}</a>
-  {{pass}}
-  {{if not 'request_reset_password' in auth.settings.actions_disabled:}}
-  <br/>
-  <a href="{{=URL(args='request_reset_password')}}">{{=T('Lost Password')}}</a>
-  {{pass}}
-  {{pass}}
+    {{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}}
 </div>
 <script language="javascript"><!--
       jQuery("#web2py_user_form input:visible:enabled:first").focus();
diff --git a/gluon/html.py b/gluon/html.py
index 82d76306..501bb441 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -2006,6 +2006,8 @@ class FORM(DIV):
         self.validate(**kwargs)
         return self
 
+    def add_button(self,value,url,_class=None):
+        self[0][-1][1].append(INPUT(_type="button",_value=value,_onclick="window.location='%s';return false" % url,_class=_class))
 
 class BEAUTIFY(DIV):