Added support for guest accout