Added logic so userId is retrieved via getUser method if it isn't available via response from addDevice method