Merge "Fix account create checkbox bug"