MARI-68 added support for login