make login optional, #6