Updated it to be more in sync with recovery.tpl and login.tpl,
 and remove the include of the deleted setup_header.tpl file.

issue #5942