diff --git a/NetworkLock.cpp b/NetworkLock.cpp
index 03f3514..b520e51 100644
--- a/NetworkLock.cpp
+++ b/NetworkLock.cpp
@@ -13,8 +13,9 @@ NetworkLock::NetworkLock(Network* network, Preferences* preferences, char* buffe
   _buffer(buffer),
   _bufferSize(bufferSize)
 {
+    memset(_authName, 0, sizeof(_authName));
+    _authName[0] = '\0';
 
-    memset(authName, 0, sizeof(authName));
     _network->registerMqttReceiver(this);
 }
 
@@ -218,7 +219,7 @@ void NetworkLock::onMqttDataReceived(const char* topic, byte* payload, const uns
 
         publishString(mqtt_topic_keypad_json_action, "--");
     }
-  
+
     if(comparePrefixedPath(topic, mqtt_topic_timecontrol_action))
     {
         if(strcmp(value, "") == 0 || strcmp(value, "--") == 0) return;
@@ -317,8 +318,8 @@ void NetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurne
         }
     }
 
-    json["auth_id"] = authId;
-    json["auth_name"] = authName;
+    json["auth_id"] = _authId;
+    json["auth_name"] = _authName;
 
     serializeJson(json, _buffer, _bufferSize);
     publishString(mqtt_topic_lock_json, _buffer);
@@ -364,8 +365,10 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
 {
     char str[50];
 
-    bool authFound = false;
-    memset(authName, 0, sizeof(authName));
+    _authId = 0;
+    memset(_authName, 0, sizeof(_authName));
+    _authName[0] = '\0';
+    _authFound = false;
 
     JsonDocument json;
 
@@ -377,18 +380,20 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
             break;
         }
         --i;
-        if((log.loggingType == NukiLock::LoggingType::LockAction || log.loggingType == NukiLock::LoggingType::KeypadAction) && ! authFound)
+        if((log.loggingType == NukiLock::LoggingType::LockAction || log.loggingType == NukiLock::LoggingType::KeypadAction) && ! _authFound)
         {
-            authFound = true;
-            authId = log.authId;
-            memcpy(authName, log.name, sizeof(log.name));
+            _authFound = true;
+            _authId = log.authId;
+            int sizeName = sizeof(log.name);
+            memcpy(_authName, log.name, sizeName);
+            if(_authName[sizeName - 1] != '\0') _authName[sizeName] = '\0';
         }
 
         auto entry = json.add();
 
         entry["index"] = log.index;
         entry["authorizationId"] = log.authId;
-        entry["authorizationName"] = log.name;
+        entry["authorizationName"] = _authName;
         entry["timeYear"] = log.timeStampYear;
         entry["timeMonth"] = log.timeStampMonth;
         entry["timeDay"] = log.timeStampDay;
@@ -454,10 +459,10 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
     serializeJson(json, _buffer, _bufferSize);
     publishString(mqtt_topic_lock_log, _buffer);
 
-    if(authFound)
+    if(_authFound)
     {
-        publishUInt(mqtt_topic_lock_auth_id, authId);
-        publishString(mqtt_topic_lock_auth_name, authName);
+        publishUInt(mqtt_topic_lock_auth_id, _authId);
+        publishString(mqtt_topic_lock_auth_name, _authName);
     }
 }
 
diff --git a/NetworkLock.h b/NetworkLock.h
index ffd87bd..db1f39b 100644
--- a/NetworkLock.h
+++ b/NetworkLock.h
@@ -91,8 +91,9 @@ private:
     uint _keypadCommandId = 0;
     int _keypadCommandEnabled = 1;
     uint8_t _queryCommands = 0;
-    uint32_t authId = 0;
-    char authName[33];
+    uint32_t _authId = 0;
+    char _authName[33];
+    bool _authFound = false;
 
     char* _buffer;
     size_t _bufferSize;
diff --git a/NetworkOpener.cpp b/NetworkOpener.cpp
index 41b2642..e1d0371 100644
--- a/NetworkOpener.cpp
+++ b/NetworkOpener.cpp
@@ -12,8 +12,9 @@ NetworkOpener::NetworkOpener(Network* network, Preferences* preferences, char* b
           _buffer(buffer),
           _bufferSize(bufferSize)
 {
+    memset(_authName, 0, sizeof(_authName));
+    _authName[0] = '\0';
 
-    memset(authName, 0, sizeof(authName));
     _network->registerMqttReceiver(this);
 }
 
@@ -292,8 +293,8 @@ void NetworkOpener::publishKeyTurnerState(const NukiOpener::OpenerState& keyTurn
         publishBool(mqtt_topic_battery_critical, critical);
     }
 
-    json["auth_id"] = authId;
-    json["auth_name"] = authName;
+    json["auth_id"] = _authId;
+    json["auth_name"] = _authName;
 
     serializeJson(json, _buffer, _bufferSize);
     publishString(mqtt_topic_lock_json, _buffer);
@@ -354,8 +355,10 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
 {
     char str[50];
 
-    bool authFound = false;
-    memset(authName, 0, sizeof(authName));
+    _authId = 0;
+    memset(_authName, 0, sizeof(_authName));
+    _authName[0] = '\0';
+    _authFound = false;
 
     JsonDocument json;
 
@@ -368,18 +371,20 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
         }
         --i;
 
-        if((log.loggingType == NukiOpener::LoggingType::LockAction || log.loggingType == NukiOpener::LoggingType::KeypadAction) && ! authFound)
+        if((log.loggingType == NukiOpener::LoggingType::LockAction || log.loggingType == NukiOpener::LoggingType::KeypadAction) && ! _authFound)
         {
-            authFound = true;
-            authId = log.authId;
-            memcpy(authName, log.name, sizeof(log.name));
+            _authFound = true;
+            _authId = log.authId;
+            int sizeName = sizeof(log.name);
+            memcpy(_authName, log.name, sizeName);
+            if(_authName[sizeName - 1] != '\0') _authName[sizeName] = '\0';
         }
 
         auto entry = json.add();
 
         entry["index"] = log.index;
         entry["authorizationId"] = log.authId;
-        entry["authorizationName"] = log.name;
+        entry["authorizationName"] = _authName;
         entry["timeYear"] = log.timeStampYear;
         entry["timeMonth"] = log.timeStampMonth;
         entry["timeDay"] = log.timeStampDay;
@@ -470,10 +475,10 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
     serializeJson(json, _buffer, _bufferSize);
     publishString(mqtt_topic_lock_log, _buffer);
 
-    if(authFound)
+    if(_authFound)
     {
-        publishUInt(mqtt_topic_lock_auth_id, authId);
-        publishString(mqtt_topic_lock_auth_name, authName);
+        publishUInt(mqtt_topic_lock_auth_id, _authId);
+        publishString(mqtt_topic_lock_auth_name, _authName);
     }
 }
 
diff --git a/NetworkOpener.h b/NetworkOpener.h
index 915cdf6..0f2b156 100644
--- a/NetworkOpener.h
+++ b/NetworkOpener.h
@@ -44,7 +44,7 @@ public:
     void setConfigUpdateReceivedCallback(void (*configUpdateReceivedCallback)(const char* value));
     void setKeypadCommandReceivedCallback(void (*keypadCommandReceivedReceivedCallback)(const char* command, const uint& id, const String& name, const String& code, const int& enabled));
     void setKeypadJsonCommandReceivedCallback(void (*keypadJsonCommandReceivedReceivedCallback)(const char* value));
-    void setTimeControlCommandReceivedCallback(void (*timeControlCommandReceivedReceivedCallback)(const char* value));    
+    void setTimeControlCommandReceivedCallback(void (*timeControlCommandReceivedReceivedCallback)(const char* value));
     void onMqttDataReceived(const char* topic, byte* payload, const unsigned int length) override;
 
     bool reconnected();
@@ -94,8 +94,9 @@ private:
     int _keypadCommandEnabled = 1;
     unsigned long _resetRingStateTs = 0;
     uint8_t _queryCommands = 0;
-    uint32_t authId = 0;
-    char authName[33];
+    uint32_t _authId = 0;
+    char _authName[33];
+    bool _authFound = false;
 
     NukiOpener::LockState _currentLockState = NukiOpener::LockState::Undefined;