ADD: Further externalisation; better redirect around the login