diff --git a/fs_decorated.lua b/fs_decorated.lua
index fb78bb0..0f1d920 100644
--- a/fs_decorated.lua
+++ b/fs_decorated.lua
@@ -11,6 +11,10 @@ minetest.register_chatcommand( 'npc_talk_style', {
 				"  Version 3: Default version.",
 	privs = {},
 	func = function(pname, param)
+		-- set a default value
+		if(not(yl_speak_up.fs_version[pname])) then
+			yl_speak_up.fs_version[pname] = 3
+		end
 		if(param and param == "1") then
 			yl_speak_up.fs_version[pname] = 1
 		elseif(param and param == "2") then
diff --git a/functions.lua b/functions.lua
index 7d96ea2..9827051 100644
--- a/functions.lua
+++ b/functions.lua
@@ -31,17 +31,22 @@ function yl_speak_up.init_mob_table()
     return false
 end
 
+
+yl_speak_up.reset_vars_for_player = function(pname)
+	yl_speak_up.speak_to[pname] = nil
+	yl_speak_up.edit_mode[pname] = nil
+	yl_speak_up.fs_version[pname] = nil
+end
+
 minetest.register_on_leaveplayer(
     function(player)
-        yl_speak_up.speak_to[player:get_player_name()] = nil
-        yl_speak_up.edit_mode[player:get_player_name()] = nil
+	yl_speak_up.reset_vars_for_player(player:get_player_name())
     end
 )
 
 minetest.register_on_joinplayer(
     function(player)
-        yl_speak_up.speak_to[player:get_player_name()] = nil
-        yl_speak_up.edit_mode[player:get_player_name()] = nil
+	yl_speak_up.reset_vars_for_player(player:get_player_name())
     end
 )