diff --git a/include/core.h b/include/core.h
index ee2b6b6..f759b74 100644
--- a/include/core.h
+++ b/include/core.h
@@ -1666,7 +1666,7 @@ public:
    cvar_t *m_eptr;
 
 public:
-   ConVar (const char *name, const char *initval, VarType type = VT_NORMAL)
+   ConVar (const char *name, const char *initval, VarType type = VT_NOSERVER)
    {
       m_eptr = NULL;
 
diff --git a/source/basecode.cpp b/source/basecode.cpp
index 9f3b00d..4a39f7b 100644
--- a/source/basecode.cpp
+++ b/source/basecode.cpp
@@ -9,10 +9,10 @@
 
 #include <core.h>
 
-ConVar yb_debug ("yb_debug", "0", VT_NOSERVER);
-ConVar yb_debug_goal ("yb_debug_goal", "-1", VT_NOSERVER);
-ConVar yb_user_follow_percent ("yb_user_follow_percent", "20", VT_NOSERVER);
-ConVar yb_user_max_followers ("yb_user_max_followers", "1", VT_NOSERVER);
+ConVar yb_debug ("yb_debug", "0");
+ConVar yb_debug_goal ("yb_debug_goal", "-1");
+ConVar yb_user_follow_percent ("yb_user_follow_percent", "20");
+ConVar yb_user_max_followers ("yb_user_max_followers", "1");
 
 ConVar yb_jasonmode ("yb_jasonmode", "0");
 ConVar yb_communication_type ("yb_communication_type", "2");
@@ -25,7 +25,7 @@ ConVar yb_freeze_bots ("yb_freeze_bots", "0");
 ConVar yb_spraypaints ("yb_spraypaints", "1");
 ConVar yb_botbuy ("yb_botbuy", "1");
 
-ConVar yb_chatter_path ("yb_chatter_path", "sound/radio/bot", VT_NOSERVER);
+ConVar yb_chatter_path ("yb_chatter_path", "sound/radio/bot");
 ConVar yb_restricted_weapons ("yb_restricted_weapons", "");
 
 // game console variables
diff --git a/source/combat.cpp b/source/combat.cpp
index 3ea3bf2..a2d14ab 100644
--- a/source/combat.cpp
+++ b/source/combat.cpp
@@ -11,8 +11,8 @@
 
 ConVar yb_shoots_thru_walls ("yb_shoots_thru_walls", "2");
 ConVar yb_ignore_enemies ("yb_ignore_enemies", "0");
-ConVar yb_csdm_mode ("yb_csdm_mode", "0", VT_NOSERVER);
-ConVar yb_check_enemy_rendering ("yb_check_enemy_rendering", "0", VT_NOSERVER);
+ConVar yb_csdm_mode ("yb_csdm_mode", "0");
+ConVar yb_check_enemy_rendering ("yb_check_enemy_rendering", "0");
 
 ConVar mp_friendlyfire ("mp_friendlyfire", NULL, VT_NOREGISTER);
 
diff --git a/source/interface.cpp b/source/interface.cpp
index 28bb87c..9bbe490 100644
--- a/source/interface.cpp
+++ b/source/interface.cpp
@@ -11,7 +11,7 @@
 
 // console vars
 ConVar yb_password ("yb_password", "", VT_PASSWORD);
-ConVar yb_password_key ("yb_password_key", "_ybpw", VT_NOSERVER);
+ConVar yb_password_key ("yb_password_key", "_ybpw");
 
 ConVar yb_language ("yb_language", "en");
 ConVar yb_version ("yb_version", PRODUCT_VERSION, VT_READONLY);
diff --git a/source/manager.cpp b/source/manager.cpp
index 0fe1ff8..2612f64 100644
--- a/source/manager.cpp
+++ b/source/manager.cpp
@@ -15,14 +15,14 @@ ConVar yb_quota ("yb_quota", "0");
 ConVar yb_quota_match ("yb_quota_match", "0");
 ConVar yb_quota_match_max ("yb_quota_match_max", "0");
 
-ConVar yb_join_after_player ("yb_join_after_player", "0", VT_NOSERVER);
+ConVar yb_join_after_player ("yb_join_after_player", "0");
 ConVar yb_join_team ("yb_join_team", "any");
 
-ConVar yb_name_prefix ("yb_name_prefix", "", VT_NOSERVER);
+ConVar yb_name_prefix ("yb_name_prefix", "");
 ConVar yb_difficulty ("yb_difficulty", "4");
 
-ConVar yb_latency_display ("yb_latency_display", "2", VT_NOSERVER);
-ConVar yb_avatar_display ("yb_avatar_display", "1", VT_NOSERVER);
+ConVar yb_latency_display ("yb_latency_display", "2");
+ConVar yb_avatar_display ("yb_avatar_display", "1");
 
 BotManager::BotManager (void)
 {
diff --git a/source/navigate.cpp b/source/navigate.cpp
index 23a64ad..fef677d 100644
--- a/source/navigate.cpp
+++ b/source/navigate.cpp
@@ -9,7 +9,7 @@
 
 #include <core.h>
 
-ConVar yb_whose_your_daddy ("yb_whose_your_daddy", "1", VT_NOSERVER);
+ConVar yb_whose_your_daddy ("yb_whose_your_daddy", "1");
 
 int Bot::FindGoal (void)
 {
diff --git a/source/support.cpp b/source/support.cpp
index 999cb20..6468272 100644
--- a/source/support.cpp
+++ b/source/support.cpp
@@ -9,7 +9,7 @@
 
 #include <core.h>
 
-ConVar yb_listenserver_welcome ("yb_listenserver_welcome", "1", VT_NOSERVER);
+ConVar yb_listenserver_welcome ("yb_listenserver_welcome", "1");
 
 ConVar mp_roundtime ("mp_roundtime", NULL, VT_NOREGISTER);
 
diff --git a/source/waypoint.cpp b/source/waypoint.cpp
index a7c97b7..7ce4851 100644
--- a/source/waypoint.cpp
+++ b/source/waypoint.cpp
@@ -9,10 +9,10 @@
 
 #include <core.h>
 
-ConVar yb_wptsubfolder ("yb_wptsubfolder", "", VT_NOSERVER);
+ConVar yb_wptsubfolder ("yb_wptsubfolder", "");
 
-ConVar yb_waypoint_autodl_host ("yb_waypoint_autodl_host", "yapb.jeefo.net", VT_NOSERVER);
-ConVar yb_waypoint_autodl_enable ("yb_waypoint_autodl_enable", "1", VT_NOSERVER);
+ConVar yb_waypoint_autodl_host ("yb_waypoint_autodl_host", "yapb.jeefo.net");
+ConVar yb_waypoint_autodl_enable ("yb_waypoint_autodl_enable", "1");
 
 void Waypoint::Init (void)
 {