Ashwin/Ajay | #0000 | Fixed sms flow