diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 198c61bcba..131aa3fbe3 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -637,7 +637,7 @@ bool DomainServer::shouldAllowConnectionFromNode(const QString& username,
     }
     
     if (allowedUsers.count() > 0) {
-        if (allowedUsers.contains(username)) {
+        if (allowedUsers.contains(username, Qt::CaseInsensitive)) {
             // it's possible this user can be allowed to connect, but we need to check their username signature
             
             QByteArray publicKeyArray = _userPublicKeys.value(username);
@@ -657,7 +657,7 @@ bool DomainServer::shouldAllowConnectionFromNode(const QString& username,
                                                            rsaPublicKey, RSA_PKCS1_PADDING);
                     
                     if (decryptResult != -1) {
-                        if (username == decryptedArray) {
+                        if (username.toLower() == decryptedArray) {
                             qDebug() << "Username signature matches for" << username << "- allowing connection.";
                             
                             // free up the public key before we return
@@ -1126,8 +1126,6 @@ void DomainServer::sendHeartbeatToDataServer(const QString& networkAddress) {
     
     QString domainUpdateJSON = QString("{\"domain\": %1 }").arg(QString(QJsonDocument(domainObject).toJson()));
     
-    qDebug() << domainUpdateJSON;
-    
     AccountManager::getInstance().authenticatedRequest(DOMAIN_UPDATE.arg(uuidStringWithoutCurlyBraces(domainID)),
                                                        QNetworkAccessManager::PutOperation,
                                                        JSONCallbackParameters(),
diff --git a/libraries/networking/src/DataServerAccountInfo.cpp b/libraries/networking/src/DataServerAccountInfo.cpp
index 600eb57166..9b513c96f1 100644
--- a/libraries/networking/src/DataServerAccountInfo.cpp
+++ b/libraries/networking/src/DataServerAccountInfo.cpp
@@ -130,11 +130,11 @@ const QByteArray& DataServerAccountInfo::getUsernameSignature() {
                                                    reinterpret_cast<const unsigned char**>(&privateKeyData),
                                                    _privateKey.size());
             if (rsaPrivateKey) {
-                QByteArray usernameByteArray = _username.toUtf8();
+                QByteArray lowercaseUsername = _username.toLower().toUtf8();
                 _usernameSignature.resize(RSA_size(rsaPrivateKey));
                 
-                int encryptReturn = RSA_private_encrypt(usernameByteArray.size(),
-                                                        reinterpret_cast<const unsigned char*>(usernameByteArray.constData()),
+                int encryptReturn = RSA_private_encrypt(lowercaseUsername.size(),
+                                                        reinterpret_cast<const unsigned char*>(lowercaseUsername.constData()),
                                                         reinterpret_cast<unsigned char*>(_usernameSignature.data()),
                                                         rsaPrivateKey, RSA_PKCS1_PADDING);