updating how keep_default+is_password are handled