Reset psword functionality to Settings, minor error msg changes