better handling of incorrect password when fetching