Non-superuser and PasswordEncoder fixes