Added support for completely new users