adding password reminders + some tidy up required!