diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 01f958589f..2d7f5ca0cd 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -96,7 +96,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     // make sure we hear about newly connected nodes from our gatekeeper
     connect(&_gatekeeper, &DomainGatekeeper::connectedNode, this, &DomainServer::handleConnectedNode);
 
-    if (optionallyReadX509KeyAndCertificate() && optionallySetupOAuth() && optionallySetupAssignmentPayment()) {
+    if (optionallyReadX509KeyAndCertificate() && optionallySetupOAuth()) {
         // we either read a certificate and private key or were not passed one
         // and completed login or did not need to
 
@@ -376,15 +376,6 @@ void DomainServer::setupNodeListAndAssignments(const QUuid& sessionUUID) {
     addStaticAssignmentsToQueue();
 }
 
-bool DomainServer::didSetupAccountManagerWithAccessToken() {
-    if (AccountManager::getInstance().hasValidAccessToken()) {
-        // we already gave the account manager a valid access token
-        return true;
-    }
-
-    return resetAccountManagerAccessToken();
-}
-
 const QString ACCESS_TOKEN_KEY_PATH = "metaverse.access_token";
 
 bool DomainServer::resetAccountManagerAccessToken() {
@@ -428,34 +419,6 @@ bool DomainServer::resetAccountManagerAccessToken() {
     }
 }
 
-bool DomainServer::optionallySetupAssignmentPayment() {
-    const QString PAY_FOR_ASSIGNMENTS_OPTION = "pay-for-assignments";
-    const QVariantMap& settingsMap = _settingsManager.getSettingsMap();
-
-    if (settingsMap.contains(PAY_FOR_ASSIGNMENTS_OPTION) &&
-        settingsMap.value(PAY_FOR_ASSIGNMENTS_OPTION).toBool() &&
-        didSetupAccountManagerWithAccessToken()) {
-
-        qDebug() << "Assignments will be paid for via" << qPrintable(_oauthProviderURL.toString());
-
-        // assume that the fact we are authing against HF data server means we will pay for assignments
-        // setup a timer to send transactions to pay assigned nodes every 30 seconds
-        QTimer* creditSetupTimer = new QTimer(this);
-        connect(creditSetupTimer, &QTimer::timeout, this, &DomainServer::setupPendingAssignmentCredits);
-
-        const qint64 CREDIT_CHECK_INTERVAL_MSECS = 5 * 1000;
-        creditSetupTimer->start(CREDIT_CHECK_INTERVAL_MSECS);
-
-        QTimer* nodePaymentTimer = new QTimer(this);
-        connect(nodePaymentTimer, &QTimer::timeout, this, &DomainServer::sendPendingTransactionsToServer);
-
-        const qint64 TRANSACTION_SEND_INTERVAL_MSECS = 30 * 1000;
-        nodePaymentTimer->start(TRANSACTION_SEND_INTERVAL_MSECS);
-    }
-
-    return true;
-}
-
 void DomainServer::setupAutomaticNetworking() {
     auto nodeList = DependencyManager::get<LimitedNodeList>();
 
@@ -466,7 +429,7 @@ void DomainServer::setupAutomaticNetworking() {
         setupICEHeartbeatForFullNetworking();
     }
 
-    if (!didSetupAccountManagerWithAccessToken()) {
+    if (!resetAccountManagerAccessToken()) {
         qDebug() << "Cannot send heartbeat to data server without an access token.";
         qDebug() << "Add an access token to your config file or via the web interface.";
 
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 326ca3e1a8..611385ecde 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -83,11 +83,9 @@ private:
     void setupNodeListAndAssignments(const QUuid& sessionUUID = QUuid::createUuid());
     bool optionallySetupOAuth();
     bool optionallyReadX509KeyAndCertificate();
-    bool optionallySetupAssignmentPayment();
 
     void optionallyGetTemporaryName(const QStringList& arguments);
 
-    bool didSetupAccountManagerWithAccessToken();
     bool resetAccountManagerAccessToken();
 
     void setupAutomaticNetworking();
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index 11b2b317a6..db9a704404 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -86,6 +86,8 @@ AccountManager::AccountManager() :
 
 void AccountManager::setIsAgent(bool isAgent) {
     if (_isAgent != isAgent) {
+        _isAgent = isAgent;
+
         if (_isAgent) {
             // any profile changes in account manager should generate a new keypair
             connect(this, &AccountManager::profileChanged, this, &AccountManager::generateNewUserKeypair);
@@ -149,8 +151,9 @@ QVariantMap accountMapFromFile(bool& success) {
 
         return accountMap;
     } else {
-        // failed to open file, return empty QVariantMap with failure
-        success = false;
+        // failed to open file, return empty QVariantMap
+        // there was only an error if the account file existed when we tried to load it
+        success = !accountFile.exists();
 
         return QVariantMap();
     }
@@ -163,26 +166,51 @@ void AccountManager::setAuthURL(const QUrl& authURL) {
         qCDebug(networking) << "AccountManager URL for authenticated requests has been changed to" << qPrintable(_authURL.toString());
         
         // check if there are existing access tokens to load from settings
-        bool loadedFile = false;
-        auto accountsMap = accountMapFromFile(loadedFile);
+        QFile accountsFile { accountFilePath() };
+        bool loadedMap = false;
+        auto accountsMap = accountMapFromFile(loadedMap);
 
-        if (loadedFile) {
+        if (accountsFile.exists() && loadedMap) {
             // pull out the stored access token and store it in memory
             _accountInfo = accountsMap[_authURL.toString()].value<DataServerAccountInfo>();
 
             qCDebug(networking) << "Found metaverse API account information for" << qPrintable(_authURL.toString());
+        } else {
+            // we didn't have a file - see if we can migrate old settings and store them in the new file
 
-            if (_isAgent) {
-                // profile info isn't guaranteed to be saved too
-                if (_accountInfo.hasProfile()) {
-                    emit profileChanged();
-                } else {
-                    requestProfile();
+            // check if there are existing access tokens to load from settings
+            Settings settings;
+            settings.beginGroup(ACCOUNTS_GROUP);
+
+            foreach(const QString& key, settings.allKeys()) {
+                // take a key copy to perform the double slash replacement
+                QString keyCopy(key);
+                QUrl keyURL(keyCopy.replace(DOUBLE_SLASH_SUBSTITUTE, "//"));
+
+                if (keyURL == _authURL) {
+                    // pull out the stored access token and store it in memory
+                    _accountInfo = settings.value(key).value<DataServerAccountInfo>();
+
+                    qCDebug(networking) << "Migrated an access token for" << qPrintable(keyURL.toString())
+                        <<  "from previous settings file";
                 }
             }
 
-        } else {
-            qCWarning(networking) << "Unable to load account file. No existing account settings will be loaded.";
+            if (_accountInfo.getAccessToken().token.isEmpty()) {
+                qCWarning(networking) << "Unable to load account file. No existing account settings will be loaded.";
+            } else {
+                // persist the migrated settings to file
+                persistAccountToSettings();
+            }
+        }
+
+        if (_isAgent && !_accountInfo.getAccessToken().token.isEmpty()) {
+            // profile info isn't guaranteed to be saved too
+            if (_accountInfo.hasProfile()) {
+                emit profileChanged();
+            } else {
+                requestProfile();
+            }
         }
 
         // tell listeners that the auth endpoint has changed