Add site url again, it is needed for password recovery e-mails
Improve form rendering