Login guidance

Supercedes #172.

Had problems with cherry-picking and git submodules again, so shamelessly used the diffs instead. Sorry @jystewart.