diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index 96e225c7e7..015a4f26cf 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -370,9 +370,8 @@ void AvatarMixer::manageIdentityData(const SharedNodePointer& node) {
 
     MixerAvatar& avatar = nodeData->getAvatar();
     bool sendIdentity = avatar.needsIdentityUpdate();
-    if (nodeData && nodeData->getAvatarSessionDisplayNameMustChange()) {
-        MixerAvatar& avatar = nodeData->getAvatar();
-        const QString& existingBaseDisplayName = nodeData->getAvatar().getSessionDisplayName();
+    if (nodeData->getAvatarSessionDisplayNameMustChange()) {
+        const QString& existingBaseDisplayName = avatar.getSessionDisplayName();
         if (!existingBaseDisplayName.isEmpty()) {
             SessionDisplayName existingDisplayName { existingBaseDisplayName };
 
diff --git a/assignment-client/src/avatars/MixerAvatar.cpp b/assignment-client/src/avatars/MixerAvatar.cpp
index 9ad4a0cfd3..fb899fb9eb 100644
--- a/assignment-client/src/avatars/MixerAvatar.cpp
+++ b/assignment-client/src/avatars/MixerAvatar.cpp
@@ -12,7 +12,7 @@
 #include <QRegularExpression>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <QJSonDocument>
+#include <QJsonDocument>
 #include <QNetworkReply>
 #include <QCryptographicHash>
 #include <QApplication>
@@ -208,7 +208,7 @@ void MixerAvatar::processCertifyEvents() {
             QNetworkReply* networkReply = networkAccessManager.put(networkRequest, QJsonDocument(request).toJson());
             connect(networkReply, &QNetworkReply::finished, this, &MixerAvatar::ownerRequestComplete);
         } else {
-            _verifyState = kVerificationFailed;
+            _needsIdentityUpdate = true;
             _pendingEvent = false;
             qCDebug(avatars) << "Avatar" << getDisplayName() << "FAILED static certification";
         }
diff --git a/assignment-client/src/avatars/MixerAvatar.h b/assignment-client/src/avatars/MixerAvatar.h
index 5a81001ea9..168fc742b7 100644
--- a/assignment-client/src/avatars/MixerAvatar.h
+++ b/assignment-client/src/avatars/MixerAvatar.h
@@ -29,21 +29,15 @@ public:
     bool needsIdentityUpdate() const { return _needsIdentityUpdate; }
     void clearIdentityUpdate() { _needsIdentityUpdate = false; }
 
-
-    //bool isPendingCertifyFailed() const { return _verifyState == kVerificationFailedPending; }
-    //void advanceCertifyFailed() {
-    //    if (isPendingCertifyFailed()) { _verifyState = kVerificationFailed; }
-    //}
     void processCertifyEvents();
     void handleChallengeResponse(ReceivedMessage * response);
 
 private:
-    bool _needsHeroCheck{ false };
+    bool _needsHeroCheck { false };
 
     // Avatar certification/verification:
     enum VerifyState { kNoncertified, kRequestingFST, kReceivedFST, kStaticValidation, kRequestingOwner, kOwnerResponse,
-        kChallengeClient, kChallengeResponse, kVerified, kVerificationFailed,
-        kVerificationSucceeded, kError };
+        kChallengeClient, kChallengeResponse, kVerified, kVerificationFailed, kVerificationSucceeded, kError };
     Q_ENUM(VerifyState);
     VerifyState _verifyState { kNoncertified };
     std::atomic<bool> _pendingEvent { false };