2
You'll need to modify the system_redirect template to make the changes you suggest. The file is located in /modules/system/templates although on my site I would modify the template directly through the admin -> templates page.
When done don't forget to delete all the files in /templates_c except for index.html so that your template changes take effect.
Rob