#38 Prevent account enumeration, and minor changes

Merged
sindre merged 2 commits from minor into master 5 years ago