Mbst 9954 login improvements