diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp
index 700a5f1b..aac0f9f0 100644
--- a/src/hacks/Aimbot.cpp
+++ b/src/hacks/Aimbot.cpp
@@ -496,7 +496,7 @@ bool ShouldAim(CUserCmd* cmd) {
 		if (g_pLocalPlayer->weapon()->m_iClassID == g_pClassID->CTFSniperRifle ||
 			g_pLocalPlayer->weapon()->m_iClassID == g_pClassID->CTFSniperRifleDecap) {
 			// confused_nigga.jpg
-			return g_pLocalPlayer->bZoomed;
+			if (!g_pLocalPlayer->bZoomed) return false;
 		}
 	}
 	if (only_can_shoot) {
diff --git a/src/hooks/others.cpp b/src/hooks/others.cpp
index ca981d2d..a5f4f0bb 100644
--- a/src/hooks/others.cpp
+++ b/src/hooks/others.cpp
@@ -185,8 +185,9 @@ void FrameStageNotify_hook(void* thisptr, int stage) {
 	}
 	if (stage == FRAME_NET_UPDATE_START) {
 		static int next_name_change = 0;
-		if (next_name_change == 0) {
+		if (next_name_change <= 0 || need_name_change) {
 			need_name_change = true;
+			next_name_change = 0;
 		} else next_name_change--;
 		if (force_name.convar->m_StringLength > 2 && need_name_change) {
 			INetChannel* ch = (INetChannel*)g_IEngine->GetNetChannelInfo();
@@ -355,6 +356,7 @@ void LevelShutdown_hook(void* thisptr) {
 	hacks::shared::aimbot::Reset();
 	chat_stack::Reset();
 	hacks::shared::spam::Reset();
+	need_name_change = true;
 	if (force_name.convar->m_StringLength > 2) {
 		//static ConVar* name_cv = g_ICvar->FindVar("name");
 		INetChannel* ch = (INetChannel*)g_IEngine->GetNetChannelInfo();