UI Logon - Refactor to use RequestAwareInterface