diff --git a/src/camera.cpp b/src/camera.cpp
index 7420e31f..874f8e56 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -553,6 +553,8 @@ void Camera::drawNametags()
 			i = m_nametags.begin();
 			i != m_nametags.end(); ++i) {
 		Nametag *nametag = *i;
+		if (!nametag->parent_node->isVisible())
+			continue;
 		if (nametag->nametag_color.getAlpha() == 0) {
 			// Enforce hiding nametag,
 			// because if freetype is enabled, a grey
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index fa8ce0ed..3fd7cbb0 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -953,7 +953,7 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr,
 		updateTextures(m_current_texture_modifier);
 
 	scene::ISceneNode *node = getSceneNode();
-	if (node && m_prop.nametag != "" && !m_is_local_player) {
+	if (node && m_prop.nametag != "") {
 		// Add nametag
 		m_nametag = m_client->getCamera()->addNametag(node,
 			m_prop.nametag, m_prop.nametag_color);
@@ -1586,7 +1586,7 @@ void GenericCAO::processMessage(const std::string &data)
 			player->makes_footstep_sound = m_prop.makes_footstep_sound;
 		}
 
-		if ((m_is_player && !m_is_local_player) && m_prop.nametag == "")
+		if (m_is_player && m_prop.nametag == "")
 			m_prop.nametag = m_name;
 
 		expireVisuals();