diff --git a/ChangeLog b/ChangeLog
index 7a1e862d3..154401c6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 ChangeLog for SVN maps trunk directory:
 ---------------------------------------------------------------------------
 Guild fixes, enabling to buy again, and manage status through the Oracle.
- python/guilds/README.txt guildbuy.py guild_entry.py guildoracle.py guild_dues.py
+ python/guilds/README.txt guildbuy.py guild_entry.py guildoracle.py
+ guild_dues.py guild_join.py
  python/CFGuilds.py
 -- Ryo 2007-02-11
 
diff --git a/python/guilds/guildjoin.py b/python/guilds/guildjoin.py
index cbdcd05cd..12f841494 100644
--- a/python/guilds/guildjoin.py
+++ b/python/guilds/guildjoin.py
@@ -39,7 +39,7 @@ guildname=Crossfire.ScriptParameters() # 1 is 'apply' event
 if (guildname):
     guild = CFGuilds.CFGuild(guildname)
     #find players by coords
-    ob=map.GetFirstObjectOnSquare(9,16)
+    ob=map.ObjectAt(9,16)
     player = find_player(ob)
     if player: # look for player
         charname=player.Name
diff --git a/python/guilds/guildoracle.py b/python/guilds/guildoracle.py
index e87ab7531..fa9be2ed4 100644
--- a/python/guilds/guildoracle.py
+++ b/python/guilds/guildoracle.py
@@ -37,7 +37,9 @@ if (guildname):
     guildhouse = CFGuilds.CFGuildHouses()
     text = string.split(Crossfire.WhatIsMessage())
 
-    if text[0] == 'help' or text[0] == 'yes':
+    if guild.info(activatorname) == 0 and isDM == 0:
+	    message = 'You don\'t belong to this guild!'
+    elif text[0] == 'help' or text[0] == 'yes':
         if isDM:
             message = '\nList of commands:\n-list\n-add <name>\n-remove <member>\n-info <member>\n-promote <member>\n-demote <member>\n-status <member> <status>\n-guildstatus <status>'
         else: