Added checks for password