diff --git a/card_scanner.lua b/card_scanner.lua
index 722ff5d..c5ebdf7 100644
--- a/card_scanner.lua
+++ b/card_scanner.lua
@@ -37,10 +37,7 @@ local function activate_palm_scanner(pos, node, player)
 		minetest.chat_send_player(name, "Access granted !")
 		mesecon.receptor_on(pos, scifi_nodes.get_switch_rules(node.param2))
 
-		player = minetest.get_player_by_name(name)
-		if player then
-			player:set_wielded_item(ItemStack(nil))
-		end
+		player:set_wielded_item(nil)
 
     -- reset state
     minetest.after(2, function()
diff --git a/form.accesscard.lua b/form.accesscard.lua
index b1ab82c..4ba543c 100644
--- a/form.accesscard.lua
+++ b/form.accesscard.lua
@@ -18,12 +18,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	end
 
 	local meta = stack:get_meta()
-
-	if meta:get_int("configured") == 1 then
-		-- already configured
-		return
-	end
-
 	meta:set_int("configured", 1)
 	meta:set_string("name", fields.name)
 	meta:set_string("description", "Access card: '" .. fields.name .. "'")
@@ -33,6 +27,15 @@ end)
 
 
 access_cards.name_form = function(player)
+
+  local stack = player:get_wielded_item()
+  local meta = stack:get_meta()
+
+  if meta:get_int("configured") == 1 then
+		-- already configured
+		return
+	end
+
 	local formspec = "size[8,1;]" ..
 		"field[0,0.5;6,1;name;Name;]" ..
 		"button_exit[6,0.1;2,1;save;Save]"