Switch to username for login
Clean up the announcer to use local name