Issue #37 login working with admin DB improvements