Improvements for setup and login

See merge request !379
5 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds