Added password name/id checks and saving.