Changes for logon