Deny password access, use keys for everything

Resubmitting this having accidentally nuked my earlier branch ;)