refactor messaging on vladui
merge
fixed messaging in authorizationListener