diff --git a/entities.lua b/entities.lua
index 81bd362..9c57b4b 100755
--- a/entities.lua
+++ b/entities.lua
@@ -735,9 +735,6 @@ minetest.register_entity("ap_airship:airship", {
         local is_admin = false
         is_admin = minetest.check_player_privs(puncher, {server=true})
 		local name = puncher:get_player_name()
-        if self.owner and self.owner ~= name and self.owner ~= "" then
-            if is_admin == false then return end
-        end
         if self.owner == nil then
             self.owner = name
         end
@@ -757,6 +754,9 @@ minetest.register_entity("ap_airship:airship", {
             --refuel
             ap_airship.load_fuel(self, puncher)
         end
+        if self.owner and self.owner ~= name and self.owner ~= "" then
+            if is_admin == false then return end
+        end
 
         -- deal with painting or destroying
         if itmstck then