More robust login steps to prevent problems when

disabled scenarios prevented the creation of default
users