Added legacy user support.