Login/Password Reminder fixes