* Fix language selection for upgraded accounts [merge from 1.4]