diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp
index a8197f70e6..c09a6fc30e 100644
--- a/src/game/Channel.cpp
+++ b/src/game/Channel.cpp
@@ -372,8 +372,6 @@ void Channel::Password(uint64 p, const char *pass)
 
     if(!m_public && sec <= SEC_MODERATOR)
     {
-        plName = plr->GetName();
-        normalizePlayerName(plName);
         chat.PSendSysMessage(LANG_CHANNEL_NOT_PUBLIC);
         return;
     }
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index e1e67ce99a..e2bf6c3cfa 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -7243,12 +7243,12 @@ bool ChatHandler::HandleChannelSetPublic(const char *args)
 
     if(val)
     {
-        CharacterDatabase.PExecute("UPDATE channels SET m_public = 1 WHERE n_name LIKE '%s'", channel);
+        CharacterDatabase.PExecute("UPDATE channels SET m_public = 1 WHERE m_name LIKE '%s'", channel);
         val = 1;
     }
     else
     {
-        CharacterDatabase.PExecute("UPDATE channels SET m_public = 0 WHERE n_name LIKE '%s'", channel);
+        CharacterDatabase.PExecute("UPDATE channels SET m_public = 0 WHERE m_name LIKE '%s'", channel);
         val = 0;
     }