Same happened to me about one month ago ,tried charge me 15.000 baht but I asked to talk to immigration officer at immigration check point at airport ,she was great realise it was immigration fault did few things on pc then changed to stamp to 60days said sorry their fault but did suggest that when entering Thailand next time to keep the passport page with visa stamp open to show immigration officer as go through immigration gate so they see stamp as they don't look for stamp