Login changes

Committing some small changes before making major changes that may need
to be rolled back.