added check to prevent asking to save password every time