simplify user form templates
Merge branch 'selfsignup' into onlinepay