Improve existing user handler to also check message text.