Fix password validation to only occur if password changed