Card #105 fix to keep password