diff --git a/cl_dll/hud.cpp b/cl_dll/hud.cpp
index c7fee44b..baff21ff 100644
--- a/cl_dll/hud.cpp
+++ b/cl_dll/hud.cpp
@@ -313,7 +313,7 @@ void CHud :: Init( void )
 	cl_minmodels = CVAR_CREATE( "cl_minmodels", "0", FCVAR_ARCHIVE );
 	cl_min_t     = CVAR_CREATE( "cl_min_t", "1", FCVAR_ARCHIVE );
 	cl_min_ct    = CVAR_CREATE( "cl_min_ct", "2", FCVAR_ARCHIVE );
-	default_fov  = CVAR_CREATE( "default_fov", "90", 0 );
+	default_fov  = CVAR_CREATE( "default_fov", "90", FCVAR_ARCHIVE );
 	m_pCvarDraw  = CVAR_CREATE( "hud_draw", "1", FCVAR_ARCHIVE );
 	fastsprites  = CVAR_CREATE( "fastsprites", "0", FCVAR_ARCHIVE );
 	cl_gunsmoke  = CVAR_CREATE( "cl_gunsmoke", "0", FCVAR_ARCHIVE );
diff --git a/cl_dll/hud_redraw.cpp b/cl_dll/hud_redraw.cpp
index 1f2ad596..2b8bf98d 100644
--- a/cl_dll/hud_redraw.cpp
+++ b/cl_dll/hud_redraw.cpp
@@ -56,6 +56,16 @@ void CHud::Think(void)
 	newfov = HUD_GetFOV();
 	m_iFOV = newfov ? newfov : default_fov->value;
 
+	if (default_fov->value < 90.0f)
+    {
+		// prevents players from entering "scope" on every weapon
+        gEngfuncs.Cvar_SetValue("default_fov", 90.0f);
+    }
+
+	if (m_iFOV == 90) {
+		m_iFOV = default_fov->value;
+	}
+
 	// the clients fov is actually set in the client data update section of the hud
 
 	// Set a new sensitivity