Fixed proxy settings and admin link render

I've fixed NEWSPLT-91 and NEWSPLT-93 - please can you review and merge. Thanks.