Changed the way user language is detected