[DO NOT MERGE]: Fix issue when returned token user id does not match case of existing account user id

Curreently out for customer review