Added support for users from api and fixed bootstrap