After updating merchant's email address, activation/Reset email content displays in Roman

After updating merchant's email address, activation/Reset email content displays in Roman.

1.Login to Japanese realm and create Merchant having email address. E.g. 'atul.sanagartest@gmail.com'

http://amljamestown.aq-qa2-front1:9986/reseller/#LOGIN
Login name : atul.sanagar@thesearchagency.com
Password: Test123

2.Verify that DB .

mysql> select * from merchant_properties where merchant_id='ea891083-d1e8-425d-9286-12660c87668d';
-------------------------------------------------------

-------------------------------------------------------

-------------------------------------------------------
4 rows in set (0.01 sec)

3.Now update the email address and save it - qathesearchagency@yahoo.in

4.Sent activation invite through 'Reports' tab and see the content of email template.

Actual result:

The content of email address displays in Roman; there are no entries for this merchant in DB.

mysql> select * from merchant_properties where merchant_id='ea891083-d1e8-425d-9286-12660c87668d';
Empty set (0.01 sec)

Expected Result: Merchant belonging to Japanese realm should be receive email in Japanese language.

Root cause: Only the first merchant user has values for language and country code in smb.users. So if you create a new merchant with a user, that user will inherit the language and country code from the merchant. But when you change the email the original merchant user is deleted and a new one is created. However the new merchant user does not have values for language and country code.