Install defaults

Simple fixes, but crucial for the basic auth scenario ;-)

Can be merged now, but more will probably come.