Logon/registration fixes