Added support for user accounts