Modifications to client/account/server