Merge pull request #1540 from dennishendriksen/master

Non-superuser and PasswordEncoder fixes
Add middle names to user account plugin