Modified demo server to work with account