A few fixes to logon to stop multiple elements appearing.