Force name entry.
Minor reload issue eased.
Merge branch 'develop' into crypto