Added sms users integration and web users integration tweaks